# HG changeset patch
# User rosfran
# Date 1161638882 -3600
# Node ID 7a654d6de88f0a5cfdfa11af92129b76549ac72a
# Parent  c9e53d7250f821e4780e47d5c7de75465604f3b1
[svn r45] Moved Myth FileTransfer, LiveTV and Myth URI to the gmyth library.

diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/Makefile.am
--- a/gst-plugins-mythtv/src/Makefile.am	Mon Oct 23 20:02:26 2006 +0100
+++ b/gst-plugins-mythtv/src/Makefile.am	Mon Oct 23 22:28:02 2006 +0100
@@ -3,10 +3,7 @@
 plugin_LTLIBRARIES =	libgstmythtvsrc.la
 
 libgstmythtvsrc_la_SOURCES =	\
-		gstmythtvsrc.c \
-		gmyth_uri.c \
-		gmyth_file_transfer.c \
-		gmyth_livetv.c
+		gstmythtvsrc.c
 
 libgstmythtvsrc_la_CFLAGS = \
 	$(GST_CFLAGS) \
@@ -20,8 +17,5 @@
 	$(GMYTH_LIBS)
 
 noinst_HEADERS = \
-	gstmythtvsrc.h \
-	gmyth_uri.h \
-	gmyth_file_transfer.h \
-	gmyth_livetv.h
+	gstmythtvsrc.h
 
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/Makefile.in
--- a/gst-plugins-mythtv/src/Makefile.in	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,547 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  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@
-
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-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 = src
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/as-version.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_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 = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(plugindir)"
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libgstmythtvsrc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libgstmythtvsrc_la_OBJECTS = libgstmythtvsrc_la-gstmythtvsrc.lo \
-	libgstmythtvsrc_la-gmyth_uri.lo \
-	libgstmythtvsrc_la-gmyth_file_transfer.lo \
-	libgstmythtvsrc_la-gmyth_livetv.lo
-libgstmythtvsrc_la_OBJECTS = $(am_libgstmythtvsrc_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libgstmythtvsrc_la_SOURCES)
-DIST_SOURCES = $(libgstmythtvsrc_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMYTH_CFLAGS = @GMYTH_CFLAGS@
-GMYTH_LIBS = @GMYTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GSTBASE_CFLAGS = @GSTBASE_CFLAGS@
-GSTBASE_LIBS = @GSTBASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
-GST_MAJORMINOR = @GST_MAJORMINOR@
-GST_PLUGINS_DIR = @GST_PLUGINS_DIR@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-HAVE_PKGCONFIG = @HAVE_PKGCONFIG@
-HILDON_CFLAGS = @HILDON_CFLAGS@
-HILDON_LIBS = @HILDON_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAEMO_PLATFORM_FALSE = @MAEMO_PLATFORM_FALSE@
-MAEMO_PLATFORM_TRUE = @MAEMO_PLATFORM_TRUE@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MYTHTVSRC_MAJORMINOR = @MYTHTVSRC_MAJORMINOR@
-MYTHTVSRC_MAJOR_VERSION = @MYTHTVSRC_MAJOR_VERSION@
-MYTHTVSRC_MICRO_VERSION = @MYTHTVSRC_MICRO_VERSION@
-MYTHTVSRC_MINOR_VERSION = @MYTHTVSRC_MINOR_VERSION@
-MYTHTVSRC_NANO_VERSION = @MYTHTVSRC_NANO_VERSION@
-MYTHTVSRC_RELEASE = @MYTHTVSRC_RELEASE@
-MYTHTVSRC_VERSION = @MYTHTVSRC_VERSION@
-NDEBUG_FALSE = @NDEBUG_FALSE@
-NDEBUG_TRUE = @NDEBUG_TRUE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-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@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
-plugin_LTLIBRARIES = libgstmythtvsrc.la
-libgstmythtvsrc_la_SOURCES = \
-		gstmythtvsrc.c \
-		gmyth_uri.c \
-		gmyth_file_transfer.c \
-		gmyth_livetv.c
-
-libgstmythtvsrc_la_CFLAGS = \
-	$(GST_CFLAGS) \
-	$(GMYTH_CFLAGS)
-
-libgstmythtvsrc_la_LDFLAGS = \
-	$(GST_PLUGIN_LDFLAGS)
-
-libgstmythtvsrc_la_LIBADD = \
-	$(GST_BASE_LIBS) \
-	$(GMYTH_LIBS)
-
-noinst_HEADERS = \
-	gstmythtvsrc.h \
-	gmyth_uri.h \
-	gmyth_file_transfer.h \
-	gmyth_livetv.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
-	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
-libgstmythtvsrc.la: $(libgstmythtvsrc_la_OBJECTS) $(libgstmythtvsrc_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(libgstmythtvsrc_la_LDFLAGS) $(libgstmythtvsrc_la_OBJECTS) $(libgstmythtvsrc_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstmythtvsrc_la-gmyth_file_transfer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstmythtvsrc_la-gmyth_livetv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstmythtvsrc_la-gmyth_uri.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstmythtvsrc_la-gstmythtvsrc.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@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@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@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 $@ $<
-
-libgstmythtvsrc_la-gstmythtvsrc.lo: gstmythtvsrc.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -MT libgstmythtvsrc_la-gstmythtvsrc.lo -MD -MP -MF "$(DEPDIR)/libgstmythtvsrc_la-gstmythtvsrc.Tpo" -c -o libgstmythtvsrc_la-gstmythtvsrc.lo `test -f 'gstmythtvsrc.c' || echo '$(srcdir)/'`gstmythtvsrc.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgstmythtvsrc_la-gstmythtvsrc.Tpo" "$(DEPDIR)/libgstmythtvsrc_la-gstmythtvsrc.Plo"; else rm -f "$(DEPDIR)/libgstmythtvsrc_la-gstmythtvsrc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gstmythtvsrc.c' object='libgstmythtvsrc_la-gstmythtvsrc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -c -o libgstmythtvsrc_la-gstmythtvsrc.lo `test -f 'gstmythtvsrc.c' || echo '$(srcdir)/'`gstmythtvsrc.c
-
-libgstmythtvsrc_la-gmyth_uri.lo: gmyth_uri.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -MT libgstmythtvsrc_la-gmyth_uri.lo -MD -MP -MF "$(DEPDIR)/libgstmythtvsrc_la-gmyth_uri.Tpo" -c -o libgstmythtvsrc_la-gmyth_uri.lo `test -f 'gmyth_uri.c' || echo '$(srcdir)/'`gmyth_uri.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgstmythtvsrc_la-gmyth_uri.Tpo" "$(DEPDIR)/libgstmythtvsrc_la-gmyth_uri.Plo"; else rm -f "$(DEPDIR)/libgstmythtvsrc_la-gmyth_uri.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gmyth_uri.c' object='libgstmythtvsrc_la-gmyth_uri.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -c -o libgstmythtvsrc_la-gmyth_uri.lo `test -f 'gmyth_uri.c' || echo '$(srcdir)/'`gmyth_uri.c
-
-libgstmythtvsrc_la-gmyth_file_transfer.lo: gmyth_file_transfer.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -MT libgstmythtvsrc_la-gmyth_file_transfer.lo -MD -MP -MF "$(DEPDIR)/libgstmythtvsrc_la-gmyth_file_transfer.Tpo" -c -o libgstmythtvsrc_la-gmyth_file_transfer.lo `test -f 'gmyth_file_transfer.c' || echo '$(srcdir)/'`gmyth_file_transfer.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgstmythtvsrc_la-gmyth_file_transfer.Tpo" "$(DEPDIR)/libgstmythtvsrc_la-gmyth_file_transfer.Plo"; else rm -f "$(DEPDIR)/libgstmythtvsrc_la-gmyth_file_transfer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gmyth_file_transfer.c' object='libgstmythtvsrc_la-gmyth_file_transfer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -c -o libgstmythtvsrc_la-gmyth_file_transfer.lo `test -f 'gmyth_file_transfer.c' || echo '$(srcdir)/'`gmyth_file_transfer.c
-
-libgstmythtvsrc_la-gmyth_livetv.lo: gmyth_livetv.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -MT libgstmythtvsrc_la-gmyth_livetv.lo -MD -MP -MF "$(DEPDIR)/libgstmythtvsrc_la-gmyth_livetv.Tpo" -c -o libgstmythtvsrc_la-gmyth_livetv.lo `test -f 'gmyth_livetv.c' || echo '$(srcdir)/'`gmyth_livetv.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgstmythtvsrc_la-gmyth_livetv.Tpo" "$(DEPDIR)/libgstmythtvsrc_la-gmyth_livetv.Plo"; else rm -f "$(DEPDIR)/libgstmythtvsrc_la-gmyth_livetv.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gmyth_livetv.c' object='libgstmythtvsrc_la-gmyth_livetv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmythtvsrc_la_CFLAGS) $(CFLAGS) -c -o libgstmythtvsrc_la-gmyth_livetv.lo `test -f 'gmyth_livetv.c' || echo '$(srcdir)/'`gmyth_livetv.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-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; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && 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)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$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)
-
-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-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-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-info-am uninstall-pluginLTLIBRARIES
-
-.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-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pluginLTLIBRARIES 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-info-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:
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gmyth_file_transfer.c
--- a/gst-plugins-mythtv/src/gmyth_file_transfer.c	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1050 +0,0 @@
-/* vim: set sw=2: -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2; c-indent-level: 2-*- */
-/**
- * GStreamer plug-in properties:
- * - location (backend server hostname/URL) [ex.: myth://192.168.1.73:28722/1000_1092091.nuv]
- * - path (qurl - remote file to be opened)
- * - port number
- *   @author Rosfran Lins Borges <rosfran.borges@indt.org.br>
- */
-
-#include "gmyth_file_transfer.h"
-#include "gmyth_uri.h"
-#include "gmyth_livetv.h"
-#include <gmyth/gmyth_util.h>
-#include <gmyth/gmyth_socket.h>
-#include <gmyth/gmyth_stringlist.h>
-
-#include <unistd.h>
-#include <glib.h>
-
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#define GMYTHTV_QUERY_HEADER "QUERY_FILETRANSFER"
-#define GMYTHTV_RECORDER_HEADER "QUERY_RECORDER"
-
-/* default values to the file transfer parameters */
-#define GMYTHTV_USER_READ_AHEAD	FALSE
-#define GMYTHTV_RETRIES			1
-#define GMYTHTV_FILE_SIZE		-1
-
-#define GMYTHTV_BUFFER_SIZE		8*1024
-
-#define GMYTHTV_VERSION			30
-
-#define GMYTHTV_TRANSFER_MAX_WAITS	700
-
-#ifdef GMYTHTV_ENABLE_DEBUG
-#define GMYTHTV_ENABLE_DEBUG	1
-#else
-#undef GMYTHTV_ENABLE_DEBUG
-#endif
-
-/* this NDEBUG is to maintain compatibility with GMyth library */
-#ifndef NDEBUG
-#define GMYTHTV_ENABLE_DEBUG	1
-#endif
-
-static guint wait_to_transfer = 0;
-
-enum myth_sock_types {
-  GMYTH_PLAYBACK_TYPE = 0,
-  GMYTH_MONITOR_TYPE,
-  GMYTH_FILETRANSFER_TYPE,
-  GMYTH_RINGBUFFER_TYPE
-};
-
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-
-static GMainContext *io_watcher_context = NULL;
-
-static void gmyth_file_transfer_class_init          (GMythFileTransferClass *klass);
-static void gmyth_file_transfer_init                (GMythFileTransfer *object);
-
-static void gmyth_file_transfer_dispose  (GObject *object);
-static void gmyth_file_transfer_finalize (GObject *object);
-
-static GMythSocket *myth_connect_to_transfer_backend( GMythFileTransfer **transfer, guint sock_type );
-static void* myth_init_io_watchers( void *data );
-
-void gmyth_file_transfer_close( GMythFileTransfer *transfer );
-
-G_DEFINE_TYPE(GMythFileTransfer, gmyth_file_transfer, G_TYPE_OBJECT)
-
-#if 0
-static guint64
-mmyth_util_decode_long_long( GMythStringList *strlist, guint offset  )
-{
-
-  guint64 ret_value = 0LL;
-
-  g_return_val_if_fail( strlist != NULL, ret_value );
-
-  if ( offset < gmyth_string_list_length( strlist ))
-    g_printerr( "[%s] Offset is lower than the GMythStringList (offset = %d)!\n", __FUNCTION__, offset );
-  g_return_val_if_fail( offset < gmyth_string_list_length( strlist ), ret_value );
-
-  gint l1 = gmyth_string_list_get_int( strlist, offset );
-  gint l2 = gmyth_string_list_get_int( strlist, offset + 1 );
-
-  ret_value = ((guint64)(l2) & 0xffffffffLL) | ((guint64)(l1) << 32);
-
-  return ret_value;
-
-}
-#endif
-
-static void
-gmyth_file_transfer_class_init (GMythFileTransferClass *klass)
-{
-  GObjectClass *gobject_class;
-
-  gobject_class = (GObjectClass *) klass;
-
-  gobject_class->dispose  = gmyth_file_transfer_dispose;
-  gobject_class->finalize = gmyth_file_transfer_finalize;
-}
-
-  static void
-gmyth_file_transfer_init (GMythFileTransfer *gmyth_file_transfer)
-{ 
-  g_return_if_fail( gmyth_file_transfer != NULL );
-  gmyth_file_transfer->mythtv_version = GMYTHTV_VERSION;
-}
-
-static void
-gmyth_file_transfer_dispose  (GObject *object)
-{
-  GMythFileTransfer *gmyth_file_transfer = GMYTH_FILE_TRANSFER(object);
-
-  gmyth_file_transfer_close( gmyth_file_transfer );
-
-  G_OBJECT_CLASS (gmyth_file_transfer_parent_class)->dispose (object);
-}
-
-  static void
-gmyth_file_transfer_finalize (GObject *object)
-{
-  g_signal_handlers_destroy (object);
-
-  G_OBJECT_CLASS (gmyth_file_transfer_parent_class)->finalize (object);
-}
-
-  GMythFileTransfer*
-gmyth_file_transfer_new (gint num, GString *uri_str, gshort port, gint mythtv_version)
-{
-  GMythFileTransfer *transfer = GMYTH_FILE_TRANSFER ( g_object_new (
-	GMYTH_FILE_TRANSFER_TYPE, FALSE ));
-
-  if ( mythtv_version > 0 )
-    transfer->mythtv_version = mythtv_version;
-
-  transfer->card_id = num;
-
-  transfer->rec_id = -1;
-
-  transfer->recordernum = num;
-  transfer->uri = gmyth_uri_new ( uri_str->str );
-
-  transfer->hostname = g_string_new( gmyth_uri_gethost(transfer->uri) );
-  g_print( "\t--> transfer->hostname = %s\n", transfer->hostname->str );
-
-  if ( port >= 0 )
-    transfer->port = port;
-  else
-    transfer->port = gmyth_uri_getport( transfer->uri );
-
-  g_print( "\t--> transfer->port = %d\n", transfer->port );
-
-  transfer->readposition = 0;
-  transfer->filesize = GMYTHTV_FILE_SIZE;
-  transfer->timeoutisfast = FALSE;
-
-  transfer->userreadahead = GMYTHTV_USER_READ_AHEAD;
-  transfer->retries = GMYTHTV_RETRIES;  
-
-  transfer->live_tv = FALSE;
-
-  transfer->query = g_string_new( GMYTHTV_QUERY_HEADER );
-  g_string_append_printf ( transfer->query, " %d", transfer->recordernum );
-  g_print( "\t--> transfer->query = %s\n", transfer->query->str );
-
-  transfer->control_sock = NULL;
-  transfer->event_sock = NULL;
-  transfer->sock = NULL;
-
-  return transfer;
-}
-
-gboolean
-gmyth_file_transfer_livetv_setup( GMythFileTransfer **transfer, GMythSocket *live_socket )
-{
-	(*transfer)->sock = live_socket;
-	g_object_ref( live_socket );
-
-	return TRUE;
-}
-
-gboolean
-gmyth_file_transfer_playback_setup( GMythFileTransfer **transfer, gboolean live_tv )
-{
-
-  gboolean ret = TRUE;
-
-  (*transfer)->live_tv = live_tv;
-
-  printf("[%s] Running config to the %s...\n", __FUNCTION__, live_tv ? "LiveTV" : "FileTransfer" );
-
-  /* configure the control socket */
-  if ((*transfer)->control_sock == NULL) { 
-
-    if ( myth_connect_to_transfer_backend ( transfer, GMYTH_PLAYBACK_TYPE ) == NULL ) {
-      g_printerr( "Connection to backend failed (Control Socket).\n" );
-      ret = FALSE;
-    }
-
-  } else {
-    g_warning("Remote transfer control socket already created.\n");
-  }
-
-  return ret;
-
-}
-
-gboolean
-gmyth_file_transfer_setup( GMythFileTransfer **transfer, gboolean live_tv )
-{
-  GMythStringList *strlist = NULL;
-
-  gboolean ret = TRUE;
-
-  (*transfer)->live_tv = live_tv;
-
-  printf("[%s] Running config to the %s...\n", __FUNCTION__, live_tv ? "LiveTV" : "FileTransfer" );
-
-#if 0
-  /* configure the control socket */
-  if ((*transfer)->event_sock == NULL) { 
-
-    if ( myth_connect_to_transfer_backend ( transfer, GMYTH_MONITOR_TYPE ) == NULL ) {
-      g_printerr( "Connection to backend failed (Event Socket).\n" );
-      ret = FALSE;
-    }
-
-  } else {
-    g_warning("Remote transfer control socket already created.\n");
-  }
-#endif
-
-  /* configure the socket */
-  if ( (*transfer)->sock == NULL ) { 
-
-    //if ( live_tv == FALSE ) {
-
-    if ( myth_connect_to_transfer_backend ( transfer, GMYTH_FILETRANSFER_TYPE ) == NULL ) {
-      g_printerr ("Connection to backend failed (Raw Transfer Socket).\n");
-      ret = FALSE;
-    }
-
-    if ( !(*transfer)->live_tv && (*transfer)->control_sock != NULL) {
-      strlist = gmyth_string_list_new();
-      g_string_printf ( (*transfer)->query, "%s %d", GMYTHTV_QUERY_HEADER, (*transfer)->recordernum );
-
-      gmyth_string_list_append_string( strlist, (*transfer)->query );
-      gmyth_string_list_append_char_array( strlist, "IS_OPEN" );
-
-      gmyth_socket_write_stringlist( (*transfer)->control_sock, strlist );
-      gmyth_socket_read_stringlist( (*transfer)->control_sock, strlist );
-
-      if ( strlist!=NULL && gmyth_string_list_get_int( strlist, 0 ) == 1 ) {
-	g_print( "[%s] Remote Myth FileTransfer socket is open!\n", __FUNCTION__ );
-      } else {
-	g_print( "[%s] Remote Myth FileTransfer socket is CLOSED! See the MythTV Server Backend for configuration details...\n", __FUNCTION__ );
-	ret = FALSE;
-      }
-    }
-
-  } else {
-    g_warning("Remote transfer (raw) socket already created.\n");
-  }
-
-  return ret;
-}
-
-static GMythSocket *
-myth_connect_to_transfer_backend( GMythFileTransfer **transfer, guint sock_type )
-{
-  GMythSocket *sock = NULL;
-
-  g_return_val_if_fail( transfer != NULL && *transfer != NULL, NULL );
-  g_return_val_if_fail( (*transfer)->uri != NULL, NULL );
-
-  g_static_mutex_lock (&mutex);
-
-  gchar *path_dir = gmyth_uri_getpath( (*transfer)->uri );
-  //g_print( "\t--> %s: path_dir = %s\n", __FUNCTION__, path_dir );
-
-  gchar *stype = g_strdup( "" );
-
-  //  if ( (*transfer)->live_tv == FALSE ) {
-
-  sock = gmyth_socket_new();
-
-  gmyth_socket_connect( &sock, (*transfer)->hostname->str, (*transfer)->port );
-
-  /*
-     } else {
-     sock = (*transfer)->sock;
-     }
-     */
-#ifdef GMYTHTV_ENABLE_DEBUG
-
-  g_print( "[%s] --> Creating socket... (%s, %d)\n", __FUNCTION__, (*transfer)->hostname->str, (*transfer)->port );
-#endif
-
-  GMythStringList *strlist = NULL;
-
-  GString *hostname = g_string_new( gmyth_uri_gethost( (*transfer)->uri ) );
-  GString *base_str = g_string_new( "" );
-
-  if ( gmyth_socket_check_protocol_version_number (sock, (*transfer)->mythtv_version) ) {
-
-    if (sock == NULL) {
-      stype = (sock_type==GMYTH_PLAYBACK_TYPE) ? "control socket" : "file data socket";
-      g_printerr( "FileTransfer, open_socket(%s): \n"
-	  "\t\t\tCould not connect to server \"%s\" @ port %d\n", stype, 
-	  (*transfer)->hostname->str, (*transfer)->port );
-      g_object_unref(sock);
-      g_static_mutex_unlock (&mutex);
-      return NULL;
-    }
-
-    hostname = gmyth_socket_get_local_hostname();
-
-    g_print( "[%s] local hostname = %s\n", __FUNCTION__, hostname->str  );
-
-    if ( sock_type == GMYTH_PLAYBACK_TYPE )
-    {
-      (*transfer)->control_sock = sock;
-      g_string_printf( base_str, "ANN Playback %s %d", hostname->str, TRUE );
-
-      gmyth_socket_send_command( (*transfer)->control_sock, base_str );
-      GString *resp = gmyth_socket_receive_response( (*transfer)->control_sock );
-      g_print( "[%s] Got Playback response from %s: %s\n", __FUNCTION__, base_str->str, resp->str );
-    }
-    else if ( sock_type == GMYTH_MONITOR_TYPE )
-    {
-      (*transfer)->event_sock = sock;
-      g_string_printf( base_str, "ANN Monitor %s %d", hostname->str, TRUE );
-
-      gmyth_socket_send_command( (*transfer)->event_sock, base_str );
-      GString *resp = gmyth_socket_receive_response( (*transfer)->event_sock );
-      g_print( "[%s] Got Monitor response from %s: %s\n", __FUNCTION__, base_str->str, resp->str );
-      //g_thread_create( myth_init_io_watchers, (void*)(*transfer), FALSE, NULL );
-      myth_init_io_watchers ( (void*)(*transfer) );
-
-      g_printerr( "[%s] Watch listener function to the IO control channel on thread %p.\n", __FUNCTION__, g_thread_self() );
-
-    }
-    else if ( sock_type == GMYTH_FILETRANSFER_TYPE )
-    {
-      (*transfer)->sock = sock;
-      strlist = gmyth_string_list_new();
-      //g_string_printf( base_str, "ANN FileTransfer %s %d %d", hostname->str,
-      //  		transfer->userreadahead, transfer->retries );
-      g_string_printf( base_str, "ANN FileTransfer %s", hostname->str );
-
-      gmyth_string_list_append_string( strlist, base_str );
-      gmyth_string_list_append_char_array( strlist, path_dir );
-
-      gmyth_socket_write_stringlist( (*transfer)->sock, strlist );
-      gmyth_socket_read_stringlist( (*transfer)->sock, strlist );
-
-      /* socket number, where all the stream data comes from - got from the MythTV remote backend */
-      (*transfer)->recordernum = gmyth_string_list_get_int( strlist, 1 );
-
-      /* Myth URI stream file size - decoded using two 8-bytes sequences (64 bits/long long types) */
-      (*transfer)->filesize = gmyth_util_decode_long_long( strlist, 2 );
-
-      printf( "[%s] ***** Received: recordernum = %d, filesize = %" G_GUINT64_FORMAT "\n", __FUNCTION__,
-	  (*transfer)->recordernum, (*transfer)->filesize );
-
-      if ( (*transfer)->filesize <= 0 ) {
-	g_print( "[%s] Got filesize equals to %llu is lesser than 0 [invalid stream file]\n", __FUNCTION__, (*transfer)->filesize );
-	g_object_unref(sock);
-	sock = NULL; 
-      }
-    }
-    else if ( sock_type == GMYTH_RINGBUFFER_TYPE )
-    {
-      (*transfer)->sock = sock;
-      //gmyth_file_transfer_spawntv( (*transfer), NULL );      
-
-      strlist = gmyth_string_list_new();
-      g_string_printf( base_str, "ANN RingBuffer %s %d", hostname->str, (*transfer)->card_id );
-
-      gmyth_socket_send_command( (*transfer)->sock, base_str );
-      GString *resp = gmyth_socket_receive_response( (*transfer)->sock );
-      g_print( "[%s] Got RingBuffer response from %s: %s\n", __FUNCTION__, base_str->str, resp->str );
-
-    }
-
-  }
-
-  printf("[%s] ANN %s sent: %s\n", (sock_type==GMYTH_PLAYBACK_TYPE) ? "Playback" : (sock_type==GMYTH_FILETRANSFER_TYPE) ? "FileTransfer" : "Monitor", __FUNCTION__, base_str->str);
-
-  if ( strlist != NULL )
-    g_object_unref( strlist );
-
-  g_static_mutex_unlock (&mutex);
-
-  return sock;
-}    
-
-void
-gmyth_file_transfer_spawntv ( GMythFileTransfer *file_transfer, 
-    GString *tvchain_id )
-{
-  GMythStringList *str_list;
-
-  g_debug ("gmyth_file_transfer_spawntv.\n");
-
-  str_list = gmyth_string_list_new ();
-
-  g_string_printf( file_transfer->query, "%s %d", GMYTHTV_RECORDER_HEADER, 
-      file_transfer->card_id );
-  gmyth_string_list_append_string (str_list, file_transfer->query);
-  gmyth_string_list_append_string (str_list, g_string_new ("SPAWN_LIVETV"));
-  if (tvchain_id!=NULL) {
-    gmyth_string_list_append_string (str_list, tvchain_id);
-    gmyth_string_list_append_int (str_list, FALSE); // PIP = FALSE (0)
-  }
-
-  gmyth_socket_sendreceive_stringlist ( file_transfer->sock, str_list );
-
-  //GString *str = NULL;
-
-  //if (str_list!=NULL && (str = gmyth_string_list_get_string( str_list, 0 )) != NULL && strcasecmp( str->str, "ok" ) != 0 ) {
-  //  g_print( "[%s]\t\tSpawnLiveTV is OK!\n", __FUNCTION__ );
-  //}
-  if (str_list!=NULL)
-    g_object_unref (str_list);
-
-}
-
-gboolean
-gmyth_file_transfer_is_recording ( GMythFileTransfer *file_transfer )
-{
-  gboolean ret = TRUE;
-  
-  GMythStringList *str_list = gmyth_string_list_new ();
-
-  g_debug ( "[%s]\n", __FUNCTION__ );
-  g_static_mutex_lock (&mutex);
-
-  g_string_printf( file_transfer->query, "%s %d", GMYTHTV_RECORDER_HEADER, 
-      file_transfer->rec_id >= 0 ? file_transfer->rec_id : file_transfer->card_id );
-  gmyth_string_list_append_string (str_list, file_transfer->query);
-  gmyth_string_list_append_string (str_list, g_string_new ("IS_RECORDING"));
-
-  gmyth_socket_sendreceive_stringlist ( file_transfer->control_sock, str_list );
-
-  if ( str_list != NULL && gmyth_string_list_length(str_list) > 0 ) 
-  {
-    GString *str = NULL;
-    if ( ( str = gmyth_string_list_get_string( str_list, 0 ) ) != NULL && strcmp( str->str, "bad" )!= 0 ) {
-      gint is_rec = gmyth_string_list_get_int( str_list, 0 );
-      if ( is_rec != 0 )
-	ret = TRUE;
-      else
-	ret = FALSE;
-    }
-  }  
-  g_print( "[%s] %s, stream is %s being recorded!\n", __FUNCTION__, ret ? "YES" : "NO", ret ? "" : "NOT" );
-  g_static_mutex_unlock (&mutex);
-
-  if ( str_list != NULL )
-    g_object_unref (str_list);
-
-  return ret;
-
-}
-
-gint64
-gmyth_file_transfer_get_file_position ( GMythFileTransfer *file_transfer )
-{
-  gint64 pos = 0;
-
-  GMythStringList *str_list = gmyth_string_list_new ();
-
-  g_debug ( "[%s]\n", __FUNCTION__ );
-  g_static_mutex_lock (&mutex);
-
-  g_string_printf( file_transfer->query, "%s %d", GMYTHTV_RECORDER_HEADER, 
-      file_transfer->rec_id >= 0 ? file_transfer->rec_id : file_transfer->card_id );
-
-  gmyth_string_list_append_string (str_list, file_transfer->query);
-  gmyth_string_list_append_string (str_list, g_string_new ("GET_FILE_POSITION"));
-
-  gmyth_socket_sendreceive_stringlist ( file_transfer->control_sock, str_list );
-
-  if ( str_list != NULL && gmyth_string_list_length(str_list) > 0 ) 
-  {
-    GString *str = NULL;
-    if ( ( str = gmyth_string_list_get_string( str_list, 0 ) ) != NULL && strstr ( str->str, "bad" ) == NULL )
-      pos = gmyth_util_decode_long_long( str_list, 0 );
-  } 
-  g_static_mutex_unlock (&mutex);
-
-#ifndef GMYTHTV_ENABLE_DEBUG
-
-  g_print( "[%s] Got file position = %lld\n", __FUNCTION__, pos );
-#endif
-  if (str_list!=NULL)
-    g_object_unref (str_list);
-
-  return pos;
-
-}
-
-  glong
-gmyth_file_transfer_get_recordernum( GMythFileTransfer *transfer )
-{
-  return transfer->recordernum;
-}
-
-  glong
-gmyth_file_transfer_get_filesize( GMythFileTransfer *transfer )
-{
-  return transfer->filesize;
-}
-
-  gboolean
-gmyth_file_transfer_isopen( GMythFileTransfer *transfer )
-{
-  return (transfer->sock != NULL && transfer->control_sock != NULL);
-}
-
-  void
-gmyth_file_transfer_close( GMythFileTransfer *transfer )
-{
-  GMythStringList *strlist;
-
-  if (transfer->control_sock == NULL)
-    return;
-
-  strlist = gmyth_string_list_new( );
-
-  g_string_printf( transfer->query, "%s %d", GMYTHTV_QUERY_HEADER, 
-      transfer->recordernum );
-  gmyth_string_list_append_string( strlist, transfer->query );
-  gmyth_string_list_append_char_array( strlist, "DONE" );
-
-
-  if ( gmyth_socket_sendreceive_stringlist(transfer->control_sock, strlist) <= 0 )
-  {
-    g_printerr( "Remote file timeout.\n" );
-  }
-
-  if (transfer->sock)
-  {
-    g_object_unref( transfer->sock );
-    transfer->sock = NULL;
-  }
-
-  if (transfer->control_sock)
-  {
-    g_object_unref( transfer->control_sock );
-    transfer->control_sock = NULL;
-  } 
-
-}
-
-  void
-gmyth_file_transfer_reset_controlsock( GMythFileTransfer *transfer )
-{
-  if (transfer->control_sock == NULL)
-  {
-    g_printerr( "gmyth_file_transfer_reset_controlsock(): Called with no control socket" );
-    return;
-  }
-
-  GString *str = gmyth_socket_receive_response( transfer->control_sock );
-
-  g_string_free( str, TRUE );
-}
-
-void
-gmyth_file_transfer_reset_sock( GMythFileTransfer *transfer )
-{
-  if ( transfer->sock == NULL )
-  {
-    g_printerr( "gmyth_file_transfer_reset_sock(): Called with no raw socket" );
-    return;
-  }
-
-  GString *str = gmyth_socket_receive_response( transfer->sock );
-
-  g_string_free( str, TRUE );
-}
-
-void
-gmyth_file_transfer_reset( GMythFileTransfer *transfer )
-{
-  gmyth_file_transfer_reset_controlsock( transfer );
-  gmyth_file_transfer_reset_sock( transfer );
-}
-
-gint64
-gmyth_file_transfer_seek(GMythFileTransfer *transfer, guint64 pos, gint whence)
-{
-  if (transfer->sock == NULL)
-  {
-    g_printerr( "[%s] gmyth_file_transfer_seek(): Called with no socket", __FUNCTION__ );
-    return 0;
-  }
-
-  if (transfer->control_sock == NULL)
-    return 0;
-
-  // if (!controlSock->isOpen() || controlSock->error())
-  //   return 0;
-
-  GMythStringList *strlist = gmyth_string_list_new();
-  g_string_printf (transfer->query, "%s %d", GMYTHTV_QUERY_HEADER, transfer->recordernum);
-  gmyth_string_list_append_string( strlist, transfer->query );
-  gmyth_string_list_append_char_array( strlist, "SEEK" );
-  gmyth_string_list_append_uint64( strlist, pos );
-  
-  gmyth_string_list_append_int( strlist, whence );  
-
-  if (pos > 0 )
-    gmyth_string_list_append_uint64( strlist, pos );
-  else
-    gmyth_string_list_append_uint64( strlist, transfer->readposition );
-  
-  gmyth_socket_sendreceive_stringlist( transfer->control_sock, strlist );
-
-  gint64 retval = gmyth_string_list_get_int64(strlist, 0);
-  transfer->readposition = retval;
-  g_print( "[%s] got reading position pointer from the streaming = %lld\n", 
-      __FUNCTION__, retval );
-
-  //gmyth_file_transfer_reset( transfer );
-
-  return retval;
-}
-
-static gboolean
-myth_control_sock_listener( GIOChannel *source, GIOCondition condition, gpointer data )
-{
-
-  GIOStatus ret;
-  GError *err = NULL;
-  gchar *msg = g_strdup("");
-  
-  g_static_mutex_lock( &mutex );  
-
-  gsize len;
-  if (condition & G_IO_HUP)
-    g_error ("Read end of pipe died!\n");
-  ret = g_io_channel_read_line ( source, &msg, &len, NULL, &err);
-  if ( ret == G_IO_STATUS_ERROR )
-    g_error ("[%s] Error reading: %s\n", __FUNCTION__, err != NULL ? err->message : "" );
-  g_print ("\n\n\n\n\n\n[%s]\t\tEVENT: Read %u bytes: %s\n\n\n\n\n", __FUNCTION__, len, msg != NULL ? msg : "" );
-  if ( msg != NULL )
-    g_free (msg);
-    
-  g_static_mutex_unlock( &mutex );
-
-  return TRUE;
-
-}
-
-static void*
-myth_init_io_watchers( void *data )
-{
-  GMythFileTransfer *transfer = (GMythFileTransfer*)data;
-  io_watcher_context = g_main_context_new();
-  GMainLoop *loop = g_main_loop_new( NULL, FALSE );
-
-  GSource *source = NULL;
-
-  if ( transfer->event_sock->sd_io_ch != NULL )
-    source = g_io_create_watch( transfer->event_sock->sd_io_ch, G_IO_IN | G_IO_HUP );
-  else
-  	goto cleanup;
-
-  g_source_set_callback ( source, (GSourceFunc)myth_control_sock_listener, NULL, NULL );
-
-  g_source_attach( source, io_watcher_context );
-
-  if (source==NULL) {
-    g_printerr( "[%s] Error adding watch listener function to the IO control channel!\n", __FUNCTION__ );
-    goto cleanup;
-  }
-  
-  g_print( "[%s]\tOK! Starting listener on the MONITOR event socket...\n", __FUNCTION__ );
-
-  g_main_loop_run( loop );
-
-cleanup:
-  if ( source != NULL )
-    g_source_unref( source );
-
-  g_main_loop_unref( loop );
-
-  g_main_context_unref( io_watcher_context );
-
-  return NULL;
-}
-
-
-gint 
-gmyth_file_transfer_read(GMythFileTransfer *transfer, void *data, gint size, gboolean read_unlimited)
-{
-  gint recv = 0;
-  gsize bytes_read = 0;
-  gint sent = 0;
-  guint remaining = 0;  
-  gboolean response = FALSE;
-
-  GIOChannel *io_channel;
-  GIOChannel *io_channel_control;
-
-  GIOCondition io_cond;
-  GIOCondition io_cond_control;
-  GIOStatus io_status = G_IO_STATUS_NORMAL, io_status_control = G_IO_STATUS_NORMAL;   
-
-  gint buf_len = GMYTHTV_BUFFER_SIZE;
-
-  GMythStringList *strlist = NULL;
-  GError *error = NULL;
-
-  gchar *trash = g_strdup("");
-
-  g_return_val_if_fail ( data != NULL, -2 );
-
-  /* gets the size of the entire file, if the size requested is lesser than 0 */
-  if ( size <= 0 )
-    size = transfer->filesize;
-
-  io_channel = transfer->sock->sd_io_ch;
-  io_channel_control = transfer->control_sock->sd_io_ch;
-
-  //g_io_channel_set_flags( io_channel, G_IO_FLAG_APPEND | 
-  //    G_IO_STATUS_AGAIN | G_IO_FLAG_IS_READABLE | G_IO_FLAG_IS_WRITEABLE | 
-  //    G_IO_FLAG_IS_SEEKABLE, NULL );
-
-  io_status = g_io_channel_set_encoding( io_channel, NULL, &error );
-  if ( io_status == G_IO_STATUS_NORMAL )
-    g_print( "[%s] Setting encoding to binary data socket).\n", __FUNCTION__ );
-
-  io_cond = g_io_channel_get_buffer_condition( io_channel );  
-
-  io_cond_control = g_io_channel_get_buffer_condition( io_channel );
-
-  if ( transfer->sock == NULL || ( io_status == G_IO_STATUS_ERROR ) )
-  {
-    g_printerr( "gmyth_file_transfer_read(): Called with no raw socket.\n" );
-    recv = -1;
-    goto cleanup;
-  }
-
-  if ( transfer->control_sock == NULL || ( io_status_control == G_IO_STATUS_ERROR ) )
-  {
-    g_printerr( "gmyth_file_transfer_read(): Called with no control socket.\n" );
-    recv = -1;
-    goto cleanup;
-  }
-
-  /*
-     if (!controlSock->isOpen() || controlSock->error())
-     return -1;
-     */
-
-  if ( ( io_cond & G_IO_IN ) != 0 ) {
-    do 
-    {
-      trash = g_new0( gchar, GMYTHTV_BUFFER_SIZE );
-
-      io_status = g_io_channel_read_chars( io_channel, trash, 
-      		GMYTHTV_BUFFER_SIZE, &bytes_read, &error);
-
-      g_print( "[%s] cleaning buffer on IO binary channel... %d bytes gone!\n", 
-      		__FUNCTION__, bytes_read );
-      
-      if ( trash != NULL )
-      	g_free( trash );
-      	
-      io_cond = g_io_channel_get_buffer_condition( io_channel );
-
-    } while ( ( io_cond & G_IO_IN ) != 0 && ( io_status != G_IO_STATUS_ERROR ) && (error == NULL) );
-
-    //if ( trash!= NULL )
-    //  g_free( trash );
-  }
-
-  if ( ( io_cond_control & G_IO_IN ) != 0 ) {
-    GMythStringList *strlist_tmp = gmyth_string_list_new();
-    gmyth_socket_read_stringlist( transfer->control_sock, strlist_tmp );
-    g_object_unref( strlist_tmp );
-  }
-
-  wait_to_transfer = 0;
-
-  //while ( transfer->live_tv && ( gmyth_file_transfer_get_file_position( transfer ) < 4096 ) &&
-  //		wait_to_transfer++ < GMYTHTV_TRANSFER_MAX_WAITS )
-  //	g_usleep( 1000*50 ); /* waits just for 2/10 second */
-
-  //g_thread_create( myth_init_io_watchers, (void*)transfer, FALSE, NULL );
-  //g_printerr( "[%s] Watch listener function to the IO control channel on thread %p.\n", __FUNCTION__, g_thread_self() );
-
-  //g_static_mutex_lock (&mutex);
-  //strlist = gmyth_string_list_new();
-
-  g_string_printf ( transfer->query, "%s %d",
-  	  /*transfer->live_tv ? GMYTHTV_RECORDER_HEADER :*/  GMYTHTV_QUERY_HEADER, 
-      /* transfer->live_tv ? transfer->card_id :*/ transfer->recordernum ); // transfer->recordernum
-  g_print( "\t[%s] Transfer_query = %s\n", __FUNCTION__, transfer->query->str );
-  
-  sent = size;
-  remaining = size - recv;  
-  //g_static_mutex_unlock( &mutex );
-  //data = (void*)g_new0( gchar, size );
-
-  //g_io_channel_flush( io_channel, NULL );
-
-  //g_static_mutex_lock( &mutex );
-
-  io_cond = g_io_channel_get_buffer_condition( io_channel );
-
-  while ( recv < size  && !response )//&& ( io_cond & G_IO_IN ) != 0 )
-  {
-  	g_io_channel_flush( io_channel_control, NULL );
-  	
-    strlist = gmyth_string_list_new();
-    gmyth_string_list_append_char_array( strlist, transfer->query->str );
-    gmyth_string_list_append_char_array( strlist, 
-    		/*transfer->live_tv ? "REQUEST_BLOCK_RINGBUF" :*/ "REQUEST_BLOCK" );
-    gmyth_string_list_append_int( strlist, remaining );
-	gmyth_socket_write_stringlist( transfer->control_sock, strlist );
-	
-	guint count_bytes = 0;
-      
-    do
-    {
-      //buf_len = ( sent - recv ) > GMYTHTV_BUFFER_SIZE ? GMYTHTV_BUFFER_SIZE : ( sent - recv );
-      if ( remaining > GMYTHTV_BUFFER_SIZE ) {
-      	buf_len = GMYTHTV_BUFFER_SIZE;
-      } else {
-      	buf_len = remaining;
-      }
-	  
-      bytes_read = 0;
-
-      io_status = g_io_channel_read_chars( io_channel, data + recv, 
-	  		buf_len, &bytes_read, &error );
-	  
-	  //g_static_mutex_unlock( &mutex );
-      /*
-	 GString *sss = g_string_new("");
-	 sss = g_string_append_len( sss, (gchar*)data+recv, bytes_read );
-
-	 g_print( "[%s] Reading buffer (length = %d)\n", __FUNCTION__, bytes_read);
-	 */
-      if ( bytes_read > 0 )
-      {
-	//if ( bytes_read <= buf_len )
-		  recv += bytes_read;
-		  count_bytes += bytes_read;
-		  remaining -= bytes_read;
-		  g_print( "[%s] Reading buffer (bytes read = %d, remaining = %d)\n", __FUNCTION__, bytes_read, remaining );
-		  if ( remaining == 0 ) {
-		  	break;
-		  }
-      } else {
-      	break;
-      }
-      
-      //if ( remaining > 0 ) {
-
-      if ( io_status == G_IO_STATUS_EOF ) {
-	g_print( "[%s] got EOS!", __FUNCTION__ );
-	break;
-      } else if ( io_status == G_IO_STATUS_ERROR ) {
-	g_print( "[%s] gmyth_file_transfer_read(): socket error.\n", __FUNCTION__ );
-	break;
-      }
-      //}
-
-      /* increase buffer size, to allow get more data (do not obey to the buffer size) */
-      if ( read_unlimited == TRUE ) {
-      	// FOR NOW, DO NOTHING!!!
-	//if ( recv > buf_len )
-	// sent += (bytes_read - buf_len) + 1;
-      }
-
-      /* verify if the input (read) buffer is ready to receive data */
-      io_cond = g_io_channel_get_buffer_condition( io_channel );
-
-      g_print( "[%s]\t io_cond %s prepared for reading! (G_IO_IN) !!!\n\n", __FUNCTION__, 
-      		( ( io_cond & G_IO_IN ) != 0 ) ? "IS" : "IS NOT" );
-      		
-      //if ( recv == size )
-		//break;
-
-    } while ( remaining > 0 );//&& ( io_status == G_IO_STATUS_NORMAL ) );
-    
-   // if ( ( recv < size ) ) {
-    //	finish_read = FALSE;
-    //}
-
-    io_cond_control = g_io_channel_get_buffer_condition( io_channel_control );
-    if ( remaining == 0 )//( io_cond_control & G_IO_IN ) != 0  )
-    {
-      gmyth_socket_read_stringlist( transfer->control_sock, strlist );
-      if ( strlist != NULL && gmyth_string_list_length( strlist ) > 0 ) 
-      {
-      	sent = gmyth_string_list_get_int( strlist,  0 ); // -1 on backend error
-      	g_print( "[%s] got SENT buffer message = %d\n", __FUNCTION__, sent );
-      	if ( sent != 0 )
-      	{
-      		g_print( "[%s]\t received = %d bytes, backend says %d bytes sent, "\
-      			"io_cond %s prepared for reading! (G_IO_IN) !!!\n\n", __FUNCTION__, 
-	  			recv, sent, ( ( io_cond & G_IO_IN ) != 0 ) ? "IS" : "IS NOT" );
-
-	  		if ( sent == count_bytes )
-	  		{
-	  			response = ( recv == size ); 
-	  			g_print( "[%s]\t\tsent %d, which is equals to bytes_read = %d\n\n", 
-	  						__FUNCTION__, sent, count_bytes );
-	  			if ( response == TRUE )
-      				break;
-	  		}
-	  		else
-	  		{
-	  			g_print( "[%s]\t\tsent %d, which is NOT equals to bytes_read = %d\n\n", 
-	  						__FUNCTION__, sent, count_bytes );
-	  			goto cleanup;
-	  			//response = FALSE;
-	  			//break;
-	  		}
-      	} else {
-      		break;
-      		//goto cleanup;
-      	} // if
-      } // if - reading control response from backend
-    } else {
-    	response = FALSE;
-    } // if - stringlist response
-    
-  } // while
-  
-  io_cond_control = g_io_channel_get_buffer_condition( io_channel_control );
- // io_cond = g_io_channel_get_buffer_condition( io_channel );
-
-  if ( ( ( io_cond_control & G_IO_IN ) != 0 ) &&  		 
-  		( response || ( recv == size ) ) )
-  {
-    if ( gmyth_socket_read_stringlist( transfer->control_sock, strlist ) > 0 )
-    {
-      if ( strlist != NULL && gmyth_string_list_length(strlist) > 0 ) 
-      {
-		sent = gmyth_string_list_get_int( strlist, 0 ); // -1 on backend error
-		g_print( "[%s]\t received = %d bytes -\tNOW returning from reading buffer I/O socket "\
-				 "[%s prepared for reading]! (G_IO_IN) !!!\n\n", __FUNCTION__, 
-	    	sent, ( ( io_cond & G_IO_IN ) != 0 ) ? "IS" : "IS NOT" );
-      }
-    }
-    else
-    {
-      g_printerr ( "gmyth_file_transfer_read(): No response from control socket.");
-      recv = -1;
-    }
-    
-  } 
-  else if ( error != NULL )
-  {
-      g_printerr( "[%s] Error occurred: (%d, %s)\n", __FUNCTION__, error->code, error->message );
-  }
-
-cleanup:
-  //g_static_mutex_unlock (&mutex);
-
-  if ( trash != NULL )
-    g_free( trash );
-
-  if ( strlist != NULL )
-    g_object_unref( strlist );
-
-  g_print( "gmyth_file_transfer_read(): reqd=%d, rcvd=%d, rept=%d, "\
-      "(rcvd and rept MUST be the same!)\n", size, 
-      recv, sent );
-
-  //if ( ( recv != size ) || ( sent != size ) ) {
-    //recv = size;
-  //}
-
-  if ( error != NULL ) {
-    g_printerr( "Cleaning-up ERROR: %s [msg = %s, code = %d]\n", __FUNCTION__, error->message, 
-	error->code );
-	g_error_free( error );
-  }
-
-  return recv;
-}
-
-void 
-gmyth_file_transfer_settimeout( GMythFileTransfer *transfer, gboolean fast )
-{
-
-  GMythStringList *strlist = NULL;
-
-  if ( transfer->timeoutisfast == fast )
-    return;
-
-  if ( transfer->sock == NULL )
-  {
-    g_printerr( "gmyth_file_transfer_settimeout(): Called with no socket" );
-    return;
-  }
-
-  if ( transfer->control_sock == NULL )
-    return;
-
-  strlist = gmyth_string_list_new(); 
-  gmyth_string_list_append_string( strlist, transfer->query );
-  gmyth_string_list_append_char_array( strlist, "SET_TIMEOUT" );
-  gmyth_string_list_append_int( strlist, fast ); 
-
-  gmyth_socket_write_stringlist( transfer->control_sock, strlist );
-  gmyth_socket_read_stringlist( transfer->control_sock, strlist );
-
-  transfer->timeoutisfast = fast;
-
-}
-
-#ifdef DO_TESTING
-
-  int
-main( int argc, char *argv[] )
-{
-  g_type_init();
-
-  GMythFileTransfer *file_transfer = gmyth_file_transfer_new( 1, 
-      g_string_new("myth://192.168.1.109:6543/jshks.nuv"), -1, GMYTHTV_VERSION );
-  gmyth_file_transfer_setup( &file_transfer );
-  gchar *data = g_strdup("");
-
-  gint num = gmyth_file_transfer_read( file_transfer, data, -1 );
-
-  return 0;
-
-}
-
-#endif
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gmyth_file_transfer.h
--- a/gst-plugins-mythtv/src/gmyth_file_transfer.h	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/* vim: set sw=2: -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2; c-indent-level: 2-*- */
-
-#ifndef __GMYTH_FILE_TRANSFER_H__
-#define __GMYTH_FILE_TRANSFER_H__
-
-#include <glib-object.h>
-
-#include <gmyth/gmyth_socket.h>
-#include "gmyth_uri.h"
-#include "gmyth_livetv.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#define G_BEGIN_DECLS
-
-#define GMYTH_FILE_TRANSFER_TYPE               (gmyth_file_transfer_get_type ())
-#define GMYTH_FILE_TRANSFER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_FILE_TRANSFER_TYPE, GMythFileTransfer))
-#define GMYTH_FILE_TRANSFER_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_FILE_TRANSFER_TYPE, GMythFileTransferClass))
-#define IS_GMYTH_FILE_TRANSFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_FILE_TRANSFER_TYPE))
-#define IS_GMYTH_FILE_TRANSFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_FILE_TRANSFER_TYPE))
-#define GMYTH_FILE_TRANSFER_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_FILE_TRANSFER_TYPE, GMythFileTransferClass))
-
-
-typedef struct _GMythFileTransfer         GMythFileTransfer;
-typedef struct _GMythFileTransferClass    GMythFileTransferClass;
-
-struct _GMythFileTransferClass
-{
-	GObjectClass parent_class;
-
-	/* callbacks */
-	/* no one for now */
-};
-
-struct _GMythFileTransfer
-{
-	GObject parent;
-
-	/* Myth URI structure */
-	const GMythURI *uri;
-	
-	/* MythTV version number */	
-	gint mythtv_version;
-
-	/* socket descriptors */
-	GMythSocket *control_sock;
-	GMythSocket *event_sock;
-	GMythSocket *sock;
-
-	guint64 readposition;
-	guint64 filesize;
-	gboolean timeoutisfast;
-	gboolean userreadahead;
-	gboolean live_tv;
-	gint retries;
-
-	GString *query;
-
-	gint rec_id;
-	gint recordernum;
-	gint card_id;
-	GString *hostname;
-	gint port;
-};
-
-GType          gmyth_file_transfer_get_type        (void);
-
-GMythFileTransfer* gmyth_file_transfer_new (gint num, GString *hostname, gshort port, gint mythtv_version );
-
-gint gmyth_file_transfer_read(GMythFileTransfer *transfer, void *data, gint size, gboolean read_unlimited);
-
-gint64 gmyth_file_transfer_seek(GMythFileTransfer *transfer, guint64 pos, gint whence);
-
-gboolean gmyth_file_transfer_playback_setup( GMythFileTransfer **transfer, gboolean live_tv );
-
-gboolean gmyth_file_transfer_setup( GMythFileTransfer **transfer, gboolean live_tv );
-
-gboolean gmyth_file_transfer_livetv_setup( GMythFileTransfer **transfer, GMythSocket *live_sock );
-
-void gmyth_file_transfer_spawntv ( GMythFileTransfer *file_transfer, GString *tvchain_id );
-
-gboolean gmyth_file_transfer_is_recording( GMythFileTransfer *file_transfer );
-
-gint64  gmyth_file_transfer_get_file_position( GMythFileTransfer *file_transfer );
-
-#define G_END_DECLS
-
-#endif /* __GMYTH_FILE_TRANSFER_H__ */
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gmyth_livetv.c
--- a/gst-plugins-mythtv/src/gmyth_livetv.c	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +0,0 @@
-
-#include <gmyth/gmyth_context.h>
-#include <gmyth/gmyth_remote_util.h>
-#include <gmyth/gmyth_tvchain.h>
-
-#include "gmyth_livetv.h"
-#include "gmyth_file_transfer.h"
-
-static void gmyth_livetv_class_init          (GMythLiveTVClass *klass);
-static void gmyth_livetv_init                (GMythLiveTV *object);
-
-static void gmyth_livetv_dispose  (GObject *object);
-static void gmyth_livetv_finalize (GObject *object);
-
-static gint tvchain_curr_index = -1; 
-
-G_DEFINE_TYPE(GMythLiveTV, gmyth_livetv, G_TYPE_OBJECT)
-
-static void
-gmyth_livetv_class_init (GMythLiveTVClass *klass)
-{
-	GObjectClass *gobject_class;
-
-	gobject_class = (GObjectClass *) klass;
-
-	gobject_class->dispose  = gmyth_livetv_dispose;
-	gobject_class->finalize = gmyth_livetv_finalize;	
-}
-
-static void
-gmyth_livetv_init (GMythLiveTV *livetv)
-{
-	livetv->backend_hostname = NULL;
-	livetv->backend_port = 0;
-	livetv->local_hostname = NULL;
-
-	livetv->remote_encoder = NULL;
-	livetv->tvchain = NULL;
-	livetv->proginfo = NULL;
-}
-
-static void
-gmyth_livetv_dispose  (GObject *object)
-{
-
-	G_OBJECT_CLASS (gmyth_livetv_parent_class)->dispose (object);
-}
-
-static void
-gmyth_livetv_finalize (GObject *object)
-{
-	g_signal_handlers_destroy (object);
-
-	GMythLiveTV *livetv = GMYTH_LIVETV (object);
-
-	g_debug ("[%s] Finalizing livetv", __FUNCTION__);
-
-	if ( livetv->remote_encoder != NULL ) {
-		g_object_unref (livetv->remote_encoder);
-		livetv->remote_encoder = NULL;
-	}
-
-	if ( livetv->tvchain != NULL ) {
-		g_object_unref (livetv->tvchain);
-		livetv->tvchain = NULL;
-	}
-
-	if ( livetv->proginfo != NULL ) {
-		g_object_unref (livetv->proginfo);
-		livetv->proginfo = NULL;
-	}
-
-	G_OBJECT_CLASS ( gmyth_livetv_parent_class )->finalize ( object );
-}
-
-GMythLiveTV*
-gmyth_livetv_new ()
-{
-	GMythLiveTV *livetv = GMYTH_LIVETV ( g_object_new( GMYTH_LIVETV_TYPE, NULL ) );
-
-	return livetv;
-}
-
-gboolean
-gmyth_livetv_setup ( GMythLiveTV *livetv )
-{
-	GMythSettings *msettings = gmyth_context_get_settings ();
-	gboolean res = TRUE;
-
-	livetv->is_livetv = TRUE;
-
-	res = gmyth_context_check_connection();
-	if (!res) {
-		g_warning ("[%s] LiveTV can not connect to backend", __FUNCTION__);	
-		res = FALSE;
-		goto error;
-	}
-
-	livetv->backend_hostname = gmyth_settings_get_backend_hostname(msettings);
-	livetv->backend_port = gmyth_settings_get_backend_port (msettings);
-
-	livetv->local_hostname  = g_string_new("");    
-	gmyth_context_get_local_hostname (livetv->local_hostname);
-
-	if ( livetv->local_hostname == NULL ) {
-		res = FALSE;
-		goto error;
-	}
-
-	// Gets the remote encoder num
-	livetv->remote_encoder = remote_request_next_free_recorder (-1);
-
-	if ( livetv->remote_encoder == NULL ) {
-		g_warning ("[%s] None remote encoder available", __FUNCTION__);
-		res = FALSE;
-		goto error;
-	}
-
-	// Creates livetv chain handler
-	livetv->tvchain = GMYTH_TVCHAIN ( g_object_new(GMYTH_TVCHAIN_TYPE, NULL) );
-	gmyth_tvchain_initialize ( livetv->tvchain, livetv->local_hostname );
-
-	if ( livetv->tvchain == NULL || livetv->tvchain->tvchain_id == NULL ) {
-		res = FALSE;
-		goto error;
-	}
-
-	// Init remote encoder. Opens its control socket.
-	res = gmyth_remote_encoder_setup(livetv->remote_encoder);
-	if ( !res ) {
-		g_warning ("[%s] Fail while setting remote encoder\n", __FUNCTION__);
-		res = FALSE;
-		goto error;
-	}
-	// Spawn live tv. Uses the socket to send mythprotocol data to start livetv in the backend (remotelly)
-	res = gmyth_remote_encoder_spawntv ( livetv->remote_encoder,
-			gmyth_tvchain_get_id(livetv->tvchain) );
-	if (!res) {
-		g_warning ("[%s] Fail while spawn tv\n", __FUNCTION__);
-		res = FALSE;
-		goto error;
-	}
-
-	// Reload all TV chain from Mysql database.
-	gmyth_tvchain_reload_all (livetv->tvchain);
-
-	if ( livetv->tvchain == NULL ) {
-		res = FALSE;
-		goto error;
-	}
-
-	// Get program info from database using chanid and starttime
-	livetv->proginfo = gmyth_tvchain_get_program_at (livetv->tvchain, tvchain_curr_index++ );
-	if ( livetv->proginfo == NULL ) {
-		g_warning ("[%s] LiveTV not successfully started.\n", __FUNCTION__ );
-		res = FALSE;
-		goto error;
-	} else {
-		g_debug ("[%s] GMythLiveTV: All requests to backend to start TV were OK.\n", __FUNCTION__ );
-	}
-
-	return res;
-
-error:
-	if ( livetv->backend_hostname != NULL ) {
-		g_string_free( livetv->backend_hostname, TRUE );
-		res = FALSE;
-	}
-
-	if ( livetv->local_hostname != NULL ) {
-		g_string_free( livetv->local_hostname, TRUE );
-		res = FALSE;
-	}
-
-	if ( livetv->remote_encoder != NULL ) {
-		g_object_unref (livetv->remote_encoder);
-		livetv->remote_encoder = NULL;
-	}
-
-	if ( livetv->tvchain != NULL ) {
-		g_object_unref (livetv->tvchain);
-		livetv->tvchain = NULL;
-	}
-
-	if ( livetv->proginfo != NULL ) {
-		g_object_unref (livetv->proginfo);
-		livetv->proginfo = NULL;
-	}
-
-	return res;
-
-}
-
-// FIXME: How to proceed differently between livetv and recorded content
-void
-gmyth_livetv_stop_playing (GMythLiveTV *livetv) 
-{
-	g_debug ("[%s] Stopping the LiveTV...\n", __FUNCTION__);
-
-	if (livetv->is_livetv) {
-		if (!gmyth_remote_encoder_stop_livetv (livetv->remote_encoder)) {
-			g_warning ("[%s] Error while stoping remote encoder", __FUNCTION__);	
-		}
-	}
-}
-
-gboolean
-gmyth_livetv_is_playing (GMythLiveTV *livetv)
-{
-	return TRUE;
-}
-
-void
-gmyth_livetv_start_playing (GMythLiveTV *livetv)
-{
-
-	// TODO
-
-}
-
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gmyth_livetv.h
--- a/gst-plugins-mythtv/src/gmyth_livetv.h	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#ifndef GMYTH_LIVETV_H_
-#define GMYTH_LIVETV_H_
-
-#include <glib-object.h>
-
-#include <gmyth/gmyth_remote_encoder.h>
-#include <gmyth/gmyth_tvchain.h>
-#include <gmyth/gmyth_common.h>
-
-#include "gmyth_file_transfer.h"
-
-#define G_BEGIN_DECLS
-
-#define GMYTH_LIVETV_TYPE               (gmyth_livetv_get_type ())
-#define GMYTH_LIVETV(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_LIVETV_TYPE, GMythLiveTV))
-#define GMYTH_LIVETV_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_LIVETV_TYPE, GMythLiveTVClass))
-#define IS_GMYTH_LIVETV(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_LIVETV_TYPE))
-#define IS_GMYTH_LIVETV_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_LIVETV_TYPE))
-#define GMYTH_LIVETV_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_LIVETV_TYPE, GMythLiveTVClass))
-
-typedef struct _GMythLiveTV         GMythLiveTV;
-typedef struct _GMythLiveTVClass    GMythLiveTVClass;
-
-struct _GMythLiveTVClass
-{
-  GObjectClass parent_class;
-
-  /* callbacks */
-};
-
-struct _GMythLiveTV
-{
-	GObject parent;
-
-	// Backend connection related variables
-	GString *backend_hostname;
-	gint backend_port;
-	GString *local_hostname;
-
-	GMythRemoteEncoder *remote_encoder;
-	GMythTVChain *tvchain;
-	GMythProgramInfo *proginfo;
-
-	gboolean is_livetv;
-
-};
-
-GType          gmyth_livetv_get_type (void);
-
-GMythLiveTV* gmyth_livetv_new ();
-
-void gmyth_livetv_start_playing (GMythLiveTV *livetv);
-void gmyth_livetv_stop_playing (GMythLiveTV *livetv);
-
-gboolean gmyth_livetv_setup (GMythLiveTV *livetv);
-
-#define G_END_DECLS
-
-#endif /*GMYTH_LIVETV_H_*/
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gmyth_uri.c
--- a/gst-plugins-mythtv/src/gmyth_uri.c	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-/**
- *
- *    GMythURI utils
- *  - Extracts and parses a URI char string, in according with the RFC 2396
- *    [http://www.ietf.org/rfc/rfc2396.txt]
- *
- *   @author Rosfran Borges (rosfran.borges@indt.org.br)
- *
- */
-
-#include "gmyth_uri.h"
-#include <glib.h>
-#include <string.h>
-#include <stdlib.h>
-
-static gint 
-gmyth_strstr( const gchar *haystack, const gchar *needle )
-{
-	
-	gchar *strPos;
-	
-	if (haystack == NULL || needle == NULL)
-		return -1;
-	strPos = strstr(haystack, needle);
-	if (strPos == NULL)
-		return -1;
-		
-	return (strPos - haystack);
-
-}
-
-static gboolean
-gmyth_uri_isabsolute( const GMythURI *uri )
-{
-	gboolean ret = FALSE;
-	
-	g_return_val_if_fail( uri != NULL && uri->uri != NULL && uri->protocol != NULL, FALSE );
-	
-	if ( gmyth_strstr( uri->uri->str, GMYTH_URI_PROTOCOL_DELIM ) == 0 || strlen(uri->protocol->str) > 0 )
-		ret = TRUE;
-		
-	return ret;	
-}
-
-static gint
-gmyth_strrchr( const gchar *str, const gchar *chars, const gint nchars )
-{
-
-	gint strLen;
-	gint i, j;
-	
-	if ( str == NULL || chars == NULL )
-		return -1;
-		
-	strLen = strlen( str );
-	for ( i= (strLen-1); 0 <= i; i-- ) {
-		for ( j=0; j<nchars; j++ ) {
-			if ( str[i] == chars[j] )
-				return i;
-		}
-	}
-
-	return -1;
-
-}
-
-static GMythURI *
-gmyth_uri_init( )
-{
-	GMythURI *uri = g_new0( GMythURI, 1 );
-	uri->host = g_string_new("");
-	uri->fragment = g_string_new("");
-	uri->password = g_string_new("");
-	uri->path = g_string_new("");
-	uri->protocol = g_string_new("");
-	uri->query = g_string_new("");
-	uri->uri = g_string_new("");
-	uri->user = g_string_new("");
-	return uri;
-}
-
-const GMythURI *
-gmyth_uri_new( gchar *value )
-{
-	
-	GMythURI *uri = gmyth_uri_init();
-
-	gchar *protocol;
-	gint uriLen;
-	gint currIdx;
-	gint protoIdx;
-	gint atIdx;
-	gint colonIdx;
-	gint shashIdx;
-	gchar *host;
-	gint eblacketIdx;
-	GString *hostStr;
-	GString *portStr;
-	gint hostLen;
-	gint sharpIdx;
-	gint questionIdx;
-	gint queryLen;
-	
-	uriLen = strlen(value);
-	uri->uri = g_string_new( value );
-		
-	currIdx = 0;
-	
-	/*** Protocol ****/
-	protoIdx = gmyth_strstr( value, GMYTH_URI_PROTOCOL_DELIM );
-	if (0 < protoIdx) {
-		uri->protocol = g_string_append_len( uri->protocol, value, protoIdx );
-		currIdx += protoIdx + strlen( GMYTH_URI_PROTOCOL_DELIM );
-	}
-
-	/*** User (Password) ****/
-	atIdx = gmyth_strstr( value+currIdx, GMYTH_URI_USER_DELIM );
-	if ( 0 < atIdx ) {
-		colonIdx = gmyth_strstr( value+currIdx, GMYTH_URI_COLON_DELIM );
-
-		if (0 < colonIdx && colonIdx < atIdx) {
-			uri->user = g_string_append_len( uri->user, value+currIdx,  colonIdx );
-			uri->password = g_string_append_len( uri->password, value+currIdx+colonIdx+1, atIdx-(colonIdx+1) );
-		}
-		else 
-			uri->user = g_string_append_len( uri->user, value+currIdx, atIdx - currIdx );
-		currIdx += atIdx + 1;
-	}
-
-	/*** Host (Port) ****/
-	shashIdx = gmyth_strstr( value+currIdx, GMYTH_URI_SLASH_DELIM );
-	if ( 0 < shashIdx )
-		uri->host = g_string_append_len( uri->host, value+currIdx, shashIdx );
-	else if ( gmyth_uri_isabsolute(uri) == TRUE )
-		uri->host = g_string_append_len( uri->host, value+currIdx, strlen(value) - currIdx );
-	host = g_strdup( gmyth_uri_gethost(uri) );
-	colonIdx = gmyth_strrchr( host, GMYTH_URI_COLON_DELIM, 1 );
-	eblacketIdx = gmyth_strrchr( host, GMYTH_URI_EBLACET_DELIM, 1 );
-	if ( ( 0 < colonIdx ) && ( eblacketIdx < colonIdx ) ) {
-		hostStr = g_string_new( host );
-
-		hostLen = hostStr->len;
-		/**** host ****/
-		uri->host = g_string_erase( uri->host, 0, hostLen );
-		uri->host = g_string_insert_len( uri->host, 0, hostStr->str, colonIdx );
-		//host = gmyth_uri_gethost( uri );
-		if (0 < hostLen) {
-			if (host[0] == '[' && host[hostLen-1] == ']')
-				uri->host = g_string_append_len( uri->host, hostStr->str+1,  colonIdx-2 );
-		}
-		/**** port ****/
-		portStr = g_string_new("");
-		portStr = g_string_append_len( portStr, hostStr->str+colonIdx+1, hostLen-colonIdx-1 );
-		uri->port = atoi( portStr->str );
-		g_string_free( portStr, TRUE );
-		g_string_free( hostStr, FALSE );
-	}
-	else {
-		uri->port = GMYTH_URI_KNKOWN_PORT;
-		protocol = gmyth_uri_getprotocol(uri);
-		if ( strcmp(protocol, GMYTH_URI_PROTOCOL_HTTP) == 0 )
-			uri->port = GMYTH_URI_DEFAULT_HTTP_PORT;
-		if ( strcmp(protocol, GMYTH_URI_PROTOCOL_FTP) == 0 )
-			uri->port = GMYTH_URI_DEFAULT_FTP_PORT;
-	}
-	
-	if (shashIdx > 0) currIdx += shashIdx;
-	
-	/*
-		Handle relative URL
-	*/
-	if (gmyth_uri_isabsolute(uri) == FALSE)
-	{
-
-		if (shashIdx != 0)
-		{
-			/* Add slash delimiter at the beginning of the URL,
-			   if it doesn't exist 
-			*/
-			uri->path = g_string_new( GMYTH_URI_SLASH_DELIM );
-		}
-		uri->path = g_string_append( uri->path, value );
-		
-	} else {
-		/* First set path simply to the rest of URI */
-		g_string_append_len( uri->path, value+currIdx,  uriLen-currIdx );
-	}
-		
-	/**** Path (Query/Fragment) ****/
-	sharpIdx = gmyth_strstr(value+currIdx, GMYTH_URI_SHARP_DELIM);
-	if (0 < sharpIdx) {
-		uri->path = g_string_append_len( uri->path, value+currIdx, sharpIdx);
-		uri->fragment = g_string_append_len( uri->fragment, 
-			value+currIdx+sharpIdx+1, uriLen-(currIdx+sharpIdx+1));
-	}
-	
-	questionIdx = gmyth_strstr( value+currIdx, GMYTH_URI_QUESTION_DELIM );
-	if ( 0 < questionIdx ) {
-		uri->path = g_string_append_len( uri->path, value+currIdx, questionIdx );
-		queryLen = uriLen-(currIdx+questionIdx+1);
-		if ( 0 < sharpIdx )
-			queryLen -= uriLen - (currIdx+sharpIdx+1);
-		uri->query = g_string_append_len( uri->query, value+currIdx+questionIdx+1, queryLen );
-	}
-	
-	return uri;
-
-}
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gmyth_uri.h
--- a/gst-plugins-mythtv/src/gmyth_uri.h	Mon Oct 23 20:02:26 2006 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/**
- *
- *	GMythURI utils
- *  - Extracts and parses a URI char string, in according with the RFC 2396 
- *    [http://www.ietf.org/rfc/rfc2396.txt]
- *
- * @author Rosfran Borges (rosfran.borges@indt.org.br)
- * 
- */
-
-#ifndef _GMYTH_URI_H_
-#define _GMYTH_URI_H_
-
-#include <glib.h>
-
-/****************************************
-* Define
-****************************************/
-
-#define GMYTH_URI_KNKOWN_PORT (-1)
-#define GMYTH_URI_DEFAULT_HTTP_PORT 80
-#define GMYTH_URI_DEFAULT_FTP_PORT 21
-#define GMYTH_URI_DEFAULT_PATH "/"
-#define GMYTH_URI_MAXLEN 256
-
-#define GMYTH_URI_PROTOCOL_DELIM "://"
-#define GMYTH_URI_USER_DELIM "@"
-#define GMYTH_URI_COLON_DELIM ":"
-#define GMYTH_URI_SLASH_DELIM "/"
-#define GMYTH_URI_SBLACET_DELIM "["
-#define GMYTH_URI_EBLACET_DELIM "]"
-#define GMYTH_URI_SHARP_DELIM "#"
-#define GMYTH_URI_QUESTION_DELIM "?"
-#define GMYTH_URI_ESCAPING_CHAR "%"
-
-#define GMYTH_URI_PROTOCOL_MYTH "myth"
-#define GMYTH_URI_PROTOCOL_HTTP "http"
-#define GMYTH_URI_PROTOCOL_FTP "ftp"
-
-/****************************************
-* Data Type
-****************************************/
-
-typedef struct _GMythURI {
-	GString *uri;
-	GString *host;
-	gint port;
-	GString *protocol;
-	GString *path;
-	GString *fragment;
-	GString *user;
-	GString *password;
-	GString *query;
-} GMythURI;
-
-const GMythURI *gmyth_uri_new( gchar *value );
-
-#define gmyth_uri_gethost(urip) (urip->host->str)
-#define gmyth_uri_getport(urip) (urip->port)
-#define gmyth_uri_getprotocol(urip) (urip->protocol->str)
-#define gmyth_uri_getpath(urip) (urip->path->str)
-
-#endif
diff -r c9e53d7250f8 -r 7a654d6de88f gst-plugins-mythtv/src/gstmythtvsrc.c
--- a/gst-plugins-mythtv/src/gstmythtvsrc.c	Mon Oct 23 20:02:26 2006 +0100
+++ b/gst-plugins-mythtv/src/gstmythtvsrc.c	Mon Oct 23 22:28:02 2006 +0100
@@ -303,6 +303,9 @@
     	
       if ( src->live_tv == FALSE ) {
 		goto done;
+      } else if ( len == 0 ) {
+      	src->update_prog_chain = TRUE;
+      	goto done;
       } else if ( /*src->content_size >= src->read_offset && 
       			abs ( src->content_size - src->read_offset ) <= 1024 ) ||*/
       			( src->content_size <= ( src->read_offset + size + GMYTHTV_TRANSFER_MAX_BUFFER ) ) )