Menu
▾
▴
gmyth-commits — GMyth commits at svn repository
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(28) |
Sep
(20) |
Oct
(20) |
Nov
(6) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(17) |
Feb
(28) |
Mar
(13) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <me...@us...> - 2008-02-21 17:55:21
|
Revision: 928
http://gmyth.svn.sourceforge.net/gmyth/?rev=928&view=rev
Author: melunko
Date: 2008-02-21 09:54:48 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
Added some information at README
Modified Paths:
--------------
trunk/gst-gpac/README
Modified: trunk/gst-gpac/README
===================================================================
--- trunk/gst-gpac/README 2008-02-21 17:52:35 UTC (rev 927)
+++ trunk/gst-gpac/README 2008-02-21 17:54:48 UTC (rev 928)
@@ -5,7 +5,25 @@
The current element only mux one stream (video MPEG4 or audio AAC).
-Test pipeline for audio. Change input.mpg and output.mpg as desired.
+Test pipeline for audio. Change input.mpg and output.mp4 as desired.
+-- Audio only --
+$ gst-launch-0.10 gpacmux name="mpg" ! filesink location="/tmp/output.mp4"
+gnomevfssrc location="file:///tmp/input.mpg" ! decodebin name="d" { d. ! queue
+! ffdeinterlace ! videorate ! videoscale ! "video/x-raw-yuv, width=(int)320,
+height=(int)240, framerate=(fraction)10/1" ! ffmpegcolorspace ! ffenc_mpeg4 !
+"video/mpeg,mpegversion=4" ! queue ! fakesink } { d. ! queue ! audioconvert !
+audioresample ! faac ! queue ! mpg. }
-Contact person: hallyson"AT"gmail"DOT"com
+
+-- Video only --
+$ gst-launch-0.10 gpacmux name="mpg" ! filesink location="/tmp/output.mp4"
+gnomevfssrc location="file:///tmp/input.mpg" ! decodebin name="d" { d. ! queue
+! ffdeinterlace ! videorate ! videoscale ! "video/x-raw-yuv, width=(int)320,
+height=(int)240, framerate=(fraction)10/1" ! ffmpegcolorspace ! ffenc_mpeg4 !
+"video/mpeg,mpegversion=4" ! queue ! mpg. } { d. ! queue ! audioconvert !
+audioresample ! faac ! queue ! fakesink }
+
+
+### Contact person: hallyson"AT"gmail"DOT"com
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2008-02-21 17:52:36
|
Revision: 927
http://gmyth.svn.sourceforge.net/gmyth/?rev=927&view=rev
Author: melunko
Date: 2008-02-21 09:52:35 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
Removed uneeded files
Removed Paths:
-------------
trunk/gst-gpac/Makefile.in
trunk/gst-gpac/autom4te.cache/
Deleted: trunk/gst-gpac/Makefile.in
===================================================================
--- trunk/gst-gpac/Makefile.in 2008-02-21 17:44:16 UTC (rev 926)
+++ trunk/gst-gpac/Makefile.in 2008-02-21 17:52:35 UTC (rev 927)
@@ -1,648 +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@
-target_triplet = @target@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
- $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/pkg.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 configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
-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); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-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@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-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@
-ERROR_CFLAGS = @ERROR_CFLAGS@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GREP = @GREP@
-GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
-GST_BASE_LIBS = @GST_BASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
-GST_MAJORMINOR = @GST_MAJORMINOR@
-GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
-GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
-GST_PLUGINS_VERSION = @GST_PLUGINS_VERSION@
-GST_PLUGINS_VERSION_MAJOR = @GST_PLUGINS_VERSION_MAJOR@
-GST_PLUGINS_VERSION_MICRO = @GST_PLUGINS_VERSION_MICRO@
-GST_PLUGINS_VERSION_MINOR = @GST_PLUGINS_VERSION_MINOR@
-GST_PLUGINS_VERSION_NANO = @GST_PLUGINS_VERSION_NANO@
-GST_PLUGINS_VERSION_RELEASE = @GST_PLUGINS_VERSION_RELEASE@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-HAVE_CXX = @HAVE_CXX@
-HAVE_PKGCONFIG = @HAVE_PKGCONFIG@
-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@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-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@
-plugindir = @plugindir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-SUBDIRS = \
- src
-
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- 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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 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
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
-# 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):
- @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; \
- (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"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @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; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (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; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- 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 || \
- tags="$$tags $$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; } \
- 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: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- 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; } \
- 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)
- $(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/m4
- @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
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
- done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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 $(SHELL) $(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-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) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(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)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && 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
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
- @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 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)
-
-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-hdr \
- distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-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-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck 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-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-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:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-20 20:31:04
|
Revision: 925
http://gmyth.svn.sourceforge.net/gmyth/?rev=925&view=rev
Author: renatofilho
Date: 2008-02-20 12:30:13 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
fixex fps property
Modified Paths:
--------------
trunk/gmyth/configure.ac
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth/configure.ac
===================================================================
--- trunk/gmyth/configure.ac 2008-02-15 13:52:23 UTC (rev 924)
+++ trunk/gmyth/configure.ac 2008-02-20 20:30:13 UTC (rev 925)
@@ -8,12 +8,6 @@
AC_CONFIG_SRCDIR([src/gmyth.h])
AC_CONFIG_HEADER(config.h)
-dnl when going to/from release please set the nano (fourth number) right !
-dnl releases only do Wall, SVN and prerelease does Werror too
-AS_VERSION(gmyth, GMYTH, 0, 7, 0, 0, GMYTH_SVN="no", GMYTH_SVN="yes")
-GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION
-AC_SUBST(GMYTH_MAJORMINOR)
-
dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
AM_MAINTAINER_MODE
dnl make aclocal work in maintainer mode
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-15 13:52:23 UTC (rev 924)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-20 20:30:13 UTC (rev 925)
@@ -469,7 +469,7 @@
GstElement *vscale;
vscale = gst_element_factory_make("videoscale", "vscale");
- //g_object_set (G_OBJECT (vscale), "method", 1, NULL);
+ g_object_set (G_OBJECT (vscale), "method", 1, NULL);
gst_bin_add(GST_BIN(vbin), vscale);
vcaps = gst_caps_new_simple("video/x-raw-yuv",
@@ -491,6 +491,7 @@
if (fps > 0) {
// Changing the video fps
+ g_debug ("Changing FPS TO : %5.2f", fps);
GstCaps *vcaps;
vrate = gst_element_factory_make("videorate", "vrate");
@@ -503,7 +504,7 @@
vcaps = gst_caps_new_simple("video/x-raw-yuv",
"framerate", GST_TYPE_FRACTION,
- (int) (fps * 1000), 1000,
+ (int) fps, 1,
NULL);
if (gst_element_link_filtered(vrate, vencode, vcaps) == FALSE) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-15 13:52:18
|
Revision: 924
http://gmyth.svn.sourceforge.net/gmyth/?rev=924&view=rev
Author: renatofilho
Date: 2008-02-15 05:52:23 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
created method gmyth_upnp_get_devices
Modified Paths:
--------------
trunk/gmyth-upnp/autogen.sh
trunk/gmyth-upnp/configure.ac
trunk/gmyth-upnp/gmyth-upnp.pc.in
trunk/gmyth-upnp/src/gmyth_upnp.c
trunk/gmyth-upnp/src/gmyth_upnp.h
Modified: trunk/gmyth-upnp/autogen.sh
===================================================================
--- trunk/gmyth-upnp/autogen.sh 2008-02-14 16:13:51 UTC (rev 923)
+++ trunk/gmyth-upnp/autogen.sh 2008-02-15 13:52:23 UTC (rev 924)
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-PKG_NAME="mtv"
+PKG_NAME="gmyth-upnp"
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
Modified: trunk/gmyth-upnp/configure.ac
===================================================================
--- trunk/gmyth-upnp/configure.ac 2008-02-14 16:13:51 UTC (rev 923)
+++ trunk/gmyth-upnp/configure.ac 2008-02-15 13:52:23 UTC (rev 924)
@@ -3,7 +3,7 @@
AC_PREREQ(2.50)
-AC_INIT([gmyth-upnp],[0.7])
+AC_INIT([gmyth-upnp],[0.7.1])
AC_CONFIG_SRCDIR([src/gmyth_upnp.c])
AC_CONFIG_HEADER(config.h)
Modified: trunk/gmyth-upnp/gmyth-upnp.pc.in
===================================================================
--- trunk/gmyth-upnp/gmyth-upnp.pc.in 2008-02-14 16:13:51 UTC (rev 923)
+++ trunk/gmyth-upnp/gmyth-upnp.pc.in 2008-02-15 13:52:23 UTC (rev 924)
@@ -5,8 +5,8 @@
Name: gmyth-upnp
Description: Myth TV upnp library based upon GLib/GObject paradigm
-Version: @VERSION@
-Requires: gobject-2.0 glib-2.0 clinkc
+Version: 0.7.1
+Requires: gobject-2.0 glib-2.0 libupnp
Libs: @LIBGMYTH_LIBS@ -L${libdir} -lgmythupnp
Cflags: @LIBGMYTH_CFLAGS@ -I${includedir}/gmyth-upnp
Modified: trunk/gmyth-upnp/src/gmyth_upnp.c
===================================================================
--- trunk/gmyth-upnp/src/gmyth_upnp.c 2008-02-14 16:13:51 UTC (rev 923)
+++ trunk/gmyth-upnp/src/gmyth_upnp.c 2008-02-15 13:52:23 UTC (rev 924)
@@ -212,6 +212,31 @@
g_warning ("Fail to start upnp listener: %d", ret);
}
+static void
+_fill_servers_cb (gpointer key,
+ gpointer value,
+ gpointer user_data)
+{
+ GList **lst;
+
+ lst = (GList **) user_data;
+
+ *lst = g_list_append (*lst, g_object_ref (value));
+}
+
+GList*
+gmyth_upnp_get_devices (GMythUPnP *self)
+{
+ GMythUPnPPrivate *priv;
+ GList *lst;
+
+ priv = GMYTH_UPNP_GET_PRIVATE (self);
+ lst = NULL;
+ g_hash_table_foreach (priv->servers, (GHFunc) _fill_servers_cb, &lst);
+
+ return lst;
+}
+
static gboolean
_idle_emit_device_found_signal (gpointer data)
{
@@ -329,7 +354,6 @@
g_strdup (uuid),
g_object_ref (info));
g_mutex_unlock (priv->mutex);
- g_debug ("info url: %s", info_url);
g_free (info_url);
idle_data = g_new0 (GMythUPnPIdleData, 1);
@@ -403,11 +427,9 @@
d_event = (struct Upnp_Discovery *) e;
- g_debug ("TYPE: %s", d_event->ServiceType);
-
if (strcmp (d_event->ServiceType, UPNP_SERVICE_FILTER) != 0)
{
- g_debug ("invalid device : %s", d_event->DeviceId);
+ g_warning ("invalid device : %s", d_event->DeviceId);
break;
}
@@ -446,7 +468,6 @@
}
default:
- g_debug ("No handle event: %d", e_type);
break;
}
Modified: trunk/gmyth-upnp/src/gmyth_upnp.h
===================================================================
--- trunk/gmyth-upnp/src/gmyth_upnp.h 2008-02-14 16:13:51 UTC (rev 923)
+++ trunk/gmyth-upnp/src/gmyth_upnp.h 2008-02-15 13:52:23 UTC (rev 924)
@@ -77,6 +77,7 @@
GType gmyth_upnp_get_type (void);
GMythUPnP* gmyth_upnp_get_instance (void);
void gmyth_upnp_search (GMythUPnP * gmyth_upnp);
+GList* gmyth_upnp_get_devices (GMythUPnP * gmyth_upnp);
G_END_DECLS
#endif /* _GMYTH_UPNP_H_ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-14 16:14:09
|
Revision: 923
http://gmyth.svn.sourceforge.net/gmyth/?rev=923&view=rev
Author: renatofilho
Date: 2008-02-14 08:13:51 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
updated daemon script
Modified Paths:
--------------
trunk/gmyth-stream/server/data/gmsd
Modified: trunk/gmyth-stream/server/data/gmsd
===================================================================
--- trunk/gmyth-stream/server/data/gmsd 2008-02-08 00:03:03 UTC (rev 922)
+++ trunk/gmyth-stream/server/data/gmsd 2008-02-14 16:13:51 UTC (rev 923)
@@ -1,62 +1,73 @@
#!/bin/sh
-PROGRAM_NAME=GMS
-PROGRAM_BIN=/usr/bin/gms.py
-PIDFILE=/var/run/gms.pid
-LOGFILE=/var/log/gms.log
-test -x $PROGRAM_BIN || exit 0
-
set -e
+DAEMON=/usr/bin/gms.py
+PIDDIR=/var/run/gms
+PIDFILE=$PIDDIR.pid
+LOGFILE=/var/log/gms.log
+DAEMONUSER=root
+NAME=gms
+DESC="GMyth transcode server"
+
+test -x $DAEMON || exit 0
. /lib/lsb/init-functions
. /etc/default/rcS
-case $1 in
- start)
- echo -n "Starting $PROGRAM_NAME: "
- if [ -f $PIDFILE ]
- then
- PID=`cat $PIDFILE`
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS="-d"
- if ps ax | grep -q "^$PID"
- then
- echo "$PROGRAM_NAME already running."
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ log_success_msg "$DESC already started; not starting."
+ return
else
+ log_success_msg "Removing stale PID file $PIDFILE."
rm -f $PIDFILE
- $PROGRAM_BIN -d > $LOGFILE 2> $LOGFILE
- echo "OK"
fi
- else
- $PROGRAM_BIN -d > $LOGFILE 2> $LOGFILE
- echo "OK"
fi
+
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- $PARAMS
+ log_end_msg $?
+}
+
+shut_it_down()
+{
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ log_end_msg $?
+ rm -f $PIDFILE
+}
+
+case $1 in
+ start)
+ start_it_up
;;
stop)
- echo -n "Stopping $PROGRAM_NAME: "
- if [ -f $PIDFILE ]
- then
- PID=`cat $PIDFILE`
- if ps -p "$PID" > /dev/null
- then
- kill -9 $PID
- fi
- rm $PIDFILE
- echo "OK"
- else
- echo "No $PROGRAM_NAME found running; no killed."
- fi
+ shut_it_down
;;
restart)
- $0 stop
- sleep 1
- $0 start
+ shut_it_down
+ start_it_up
;;
*)
- log_success_msg "Usage: $0 {stop|start|restart}"
- exit 1
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart}" >&2
+ exit 2
;;
esac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2008-02-08 00:03:03
|
Revision: 922
http://gmyth.svn.sourceforge.net/gmyth/?rev=922&view=rev
Author: melunko
Date: 2008-02-07 16:03:03 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
Added method to check mythtv backend connection
Modified Paths:
--------------
trunk/gmyth-dbus/configure.ac
trunk/gmyth-dbus/src/gmyth-dbus-server.c
trunk/gmyth-dbus/src/gmyth-dbus-server.xml
Modified: trunk/gmyth-dbus/configure.ac
===================================================================
--- trunk/gmyth-dbus/configure.ac 2008-02-07 19:36:22 UTC (rev 921)
+++ trunk/gmyth-dbus/configure.ac 2008-02-08 00:03:03 UTC (rev 922)
@@ -67,7 +67,7 @@
PKG_CHECK_MODULES(GMYTH, gmyth >= 0.7, HAVE_GMYTH=yes, HAVE_GMYTH=no)
if test "x$HAVE_GMYTH" = "xno"; then
- AC_MSG_ERROR(you need libgmyth-dev installed)
+ AC_MSG_ERROR(you need libgmyth-dev >= 0.7 installed)
fi
AC_SUBST(GMYTH_CFLAGS)
AC_SUBST(GMYTH_LIBS)
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-02-07 19:36:22 UTC (rev 921)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-02-08 00:03:03 UTC (rev 922)
@@ -92,7 +92,11 @@
const gchar *user,
const gchar *password,
GError **error);
-
+static gboolean
+gmyth_dbus_server_check_server_connection (GObject *obj,
+ const gchar *host,
+ gint port,
+ GError **error);
static gboolean gmyth_dbus_server_get_channel_list (GObject *obj,
GPtrArray **channels,
GError **error);
@@ -1313,6 +1317,32 @@
if (!ret) {
g_set_error (error, GMYTH_DBUS_ERROR, GMYTH_DBUS_ERROR_CONNECTION,
+ _("Fail to connect with backend database"));
+ }
+
+ return ret;
+}
+
+static gboolean
+gmyth_dbus_server_check_server_connection (GObject *obj,
+ const gchar *host,
+ gint port,
+ GError **error)
+{
+ GMythSocket *msocket = gmyth_socket_new ();
+ gboolean ret;
+
+ gmyth_debug ("");
+
+ g_debug ("Checking server connection");
+ ret = gmyth_socket_connect_with_timeout (msocket, host, port, 2);
+ g_debug ("Return %s", ret ? "ok" : "bad");
+ gmyth_socket_close_connection (msocket);
+
+ g_object_unref (msocket);
+
+ if (!ret) {
+ g_set_error (error, GMYTH_DBUS_ERROR, GMYTH_DBUS_ERROR_CONNECTION,
_("Fail to connect with backend"));
}
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.xml
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-02-07 19:36:22 UTC (rev 921)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-02-08 00:03:03 UTC (rev 922)
@@ -18,6 +18,11 @@
<arg type="s" name="password" direction="in" />
</method>
+ <method name="CheckServerConnection">
+ <arg type="s" name="host" direction="in" />
+ <arg type="i" name="port" direction="in" />
+ </method>
+
<method name="Connected">
<arg type="b" name="status" direction="out" />
</method>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2008-02-07 19:36:19
|
Revision: 921
http://gmyth.svn.sourceforge.net/gmyth/?rev=921&view=rev
Author: melunko
Date: 2008-02-07 11:36:22 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
Added gmyth_dbus_server_check_db_connection() function
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
trunk/gmyth-dbus/src/gmyth-dbus-server.xml
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-02-04 18:25:58 UTC (rev 920)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-02-07 19:36:22 UTC (rev 921)
@@ -86,6 +86,13 @@
const gchar *user,
const gchar *password,
GError **error);
+static gboolean gmyth_dbus_server_check_db_connection (GObject *self,
+ const gchar *host,
+ gint port,
+ const gchar *user,
+ const gchar *password,
+ GError **error);
+
static gboolean gmyth_dbus_server_get_channel_list (GObject *obj,
GPtrArray **channels,
GError **error);
@@ -1282,3 +1289,33 @@
return FALSE;
}
+static gboolean
+gmyth_dbus_server_check_db_connection (GObject *obj,
+ const gchar *host,
+ gint port,
+ const gchar *user,
+ const gchar *password,
+ GError **error)
+{
+ GMythQuery *query = gmyth_query_new ();
+ GMythBackendInfo *binfo;
+ gboolean ret;
+
+ gmyth_debug ("");
+
+ binfo = gmyth_backend_info_new_full (host, user, password, MYTH_DEFAULT_DB, port);
+
+ ret = gmyth_query_connect_with_timeout (query, binfo, 2 /*seconds*/);
+ gmyth_query_disconnect (query);
+
+ g_object_unref (query);
+ g_object_unref (binfo);
+
+ if (!ret) {
+ g_set_error (error, GMYTH_DBUS_ERROR, GMYTH_DBUS_ERROR_CONNECTION,
+ _("Fail to connect with backend"));
+ }
+
+ return ret;
+}
+
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.xml
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-02-04 18:25:58 UTC (rev 920)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-02-07 19:36:22 UTC (rev 921)
@@ -11,6 +11,13 @@
<arg type="s" name="password" direction="in" />
</method>
+ <method name="CheckDbConnection">
+ <arg type="s" name="host" direction="in" />
+ <arg type="i" name="port" direction="in" />
+ <arg type="s" name="user" direction="in" />
+ <arg type="s" name="password" direction="in" />
+ </method>
+
<method name="Connected">
<arg type="b" name="status" direction="out" />
</method>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-04 18:25:55
|
Revision: 920
http://gmyth.svn.sourceforge.net/gmyth/?rev=920&view=rev
Author: renatofilho
Date: 2008-02-04 10:25:58 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
Creating branche 0.7.0
Added Paths:
-----------
branches/release-0.7.0/
Copied: branches/release-0.7.0 (from rev 919, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-04 18:25:18
|
Revision: 919
http://gmyth.svn.sourceforge.net/gmyth/?rev=919&view=rev
Author: renatofilho
Date: 2008-02-04 10:25:19 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
wrong branch created
Removed Paths:
-------------
branches/release-0.7.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-04 18:23:45
|
Revision: 918
http://gmyth.svn.sourceforge.net/gmyth/?rev=918&view=rev
Author: renatofilho
Date: 2008-02-04 10:23:49 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
moved debian dir from gst-gmyth and libgnomevfs2-mythtv to packages project
Modified Paths:
--------------
trunk/gmyth/configure.ac
trunk/gmyth/src/gmyth_backendinfo.c
trunk/gmyth/src/gmyth_backendinfo.h
trunk/gmyth/src/gmyth_programinfo.h
trunk/libgnomevfs2-mythtv/AUTHORS
Added Paths:
-----------
trunk/packages/gst-debian/
trunk/packages/gst-debian/changelog
trunk/packages/gst-debian/compat
trunk/packages/gst-debian/control
trunk/packages/gst-debian/copyright
trunk/packages/gst-debian/gstreamer0.10-indt-mythtvsrc.install
trunk/packages/gst-debian/gstreamer0.10-indt-nuvdemux.install
trunk/packages/gst-debian/maemo-nuvdemux.install
trunk/packages/gst-debian/maemo-nuvdemux.postinst
trunk/packages/gst-debian/nuv.xml
trunk/packages/gst-debian/osso_media_server_nuv.schemas
trunk/packages/gst-debian/rules
trunk/packages/gvfs-debian/
trunk/packages/gvfs-debian/README.Debian
trunk/packages/gvfs-debian/changelog
trunk/packages/gvfs-debian/compat
trunk/packages/gvfs-debian/control
trunk/packages/gvfs-debian/copyright
trunk/packages/gvfs-debian/dirs
trunk/packages/gvfs-debian/rules
Removed Paths:
-------------
trunk/gst-gmyth/debian/
trunk/libgnomevfs2-mythtv/debian/
Modified: trunk/gmyth/configure.ac
===================================================================
--- trunk/gmyth/configure.ac 2008-02-04 18:18:05 UTC (rev 917)
+++ trunk/gmyth/configure.ac 2008-02-04 18:23:49 UTC (rev 918)
@@ -3,14 +3,14 @@
AC_PREREQ(2.50)
-AC_INIT([gmyth],[0.4.1])
+AC_INIT([gmyth],[0.7.0])
AC_CONFIG_SRCDIR([src/gmyth.h])
AC_CONFIG_HEADER(config.h)
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, SVN and prerelease does Werror too
-AS_VERSION(gmyth, GMYTH, 0, 4, 1, 0, GMYTH_SVN="no", GMYTH_SVN="yes")
+AS_VERSION(gmyth, GMYTH, 0, 7, 0, 0, GMYTH_SVN="no", GMYTH_SVN="yes")
GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION
AC_SUBST(GMYTH_MAJORMINOR)
Modified: trunk/gmyth/src/gmyth_backendinfo.c
===================================================================
--- trunk/gmyth/src/gmyth_backendinfo.c 2008-02-04 18:18:05 UTC (rev 917)
+++ trunk/gmyth/src/gmyth_backendinfo.c 2008-02-04 18:23:49 UTC (rev 918)
@@ -41,8 +41,8 @@
static void gmyth_backend_info_dispose(GObject * object);
static void gmyth_backend_info_finalize(GObject * object);
-G_DEFINE_TYPE(GMythBackendInfo, gmyth_backend_info, G_TYPE_OBJECT)
- static void gmyth_backend_info_class_init(GMythBackendInfoClass *
+G_DEFINE_TYPE(GMythBackendInfo, gmyth_backend_info, G_TYPE_OBJECT);
+static void gmyth_backend_info_class_init(GMythBackendInfoClass *
klass)
{
GObjectClass *gobject_class;
Modified: trunk/gmyth/src/gmyth_backendinfo.h
===================================================================
--- trunk/gmyth/src/gmyth_backendinfo.h 2008-02-04 18:18:05 UTC (rev 917)
+++ trunk/gmyth/src/gmyth_backendinfo.h 2008-02-04 18:23:49 UTC (rev 918)
@@ -84,7 +84,7 @@
};
-GType gmyth_backend_info_get_type (void) G_GNUC_CONST;;
+GType gmyth_backend_info_get_type (void) G_GNUC_CONST;
GMythBackendInfo* gmyth_backend_info_new (void);
GMythBackendInfo* gmyth_backend_info_new_full (const gchar *hostname,
const gchar *username,
Modified: trunk/gmyth/src/gmyth_programinfo.h
===================================================================
--- trunk/gmyth/src/gmyth_programinfo.h 2008-02-04 18:18:05 UTC (rev 917)
+++ trunk/gmyth/src/gmyth_programinfo.h 2008-02-04 18:23:49 UTC (rev 918)
@@ -149,7 +149,7 @@
GString *hostname;
};
-GType gmyth_program_info_type(void);
+GType gmyth_program_info_get_type(void);
GMythProgramInfo *gmyth_program_info_new(void);
Modified: trunk/libgnomevfs2-mythtv/AUTHORS
===================================================================
--- trunk/libgnomevfs2-mythtv/AUTHORS 2008-02-04 18:18:05 UTC (rev 917)
+++ trunk/libgnomevfs2-mythtv/AUTHORS 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,4 @@
+Alexsandro Jose Virginio dos Santos <ale...@in...>
+Hallyson Luiz de Morais Melo <hal...@in...>
+Leonardo Sobral Cunha <leo...@in...>
+Rosfran Lins Borges <ros...@in...>
Added: trunk/packages/gst-debian/changelog
===================================================================
--- trunk/packages/gst-debian/changelog (rev 0)
+++ trunk/packages/gst-debian/changelog 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,12 @@
+gstreamer0.10-indt-plugins (0.10.14-svn20080107) gutsy; urgency=low
+
+ * Relase 01/07/2007;
+
+ -- Renato Araujo Oliveira Filho <ren...@in...> Mon, 07 Jan 2008 10:38:00 -0300
+
+gstreamer0.10-indt-plugins (0.10.2-svn20070914) unstable; urgency=low
+
+ * Initial packaged;
+
+ -- Renato Araujo Oliveira Filho <ren...@in...> Thu, 09 Nov 2006 15:58:00 -0300
+
Added: trunk/packages/gst-debian/compat
===================================================================
--- trunk/packages/gst-debian/compat (rev 0)
+++ trunk/packages/gst-debian/compat 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1 @@
+4
Added: trunk/packages/gst-debian/control
===================================================================
--- trunk/packages/gst-debian/control (rev 0)
+++ trunk/packages/gst-debian/control 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,30 @@
+Source: gstreamer0.10-indt-plugins
+Section: user/library
+Priority: optional
+Maintainer: Renato Araujo Oliveira Filho <ren...@in...>
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8), autotools-dev, pkg-config (>= 0.11.0), libgstreamer0.10-dev (>= 0.10.0), gmyth-dev (>= 0.3)
+Standards-Version: 3.6.2
+Section: user/library
+
+Package: gstreamer0.10-indt-nuvdemux
+Architecture: any
+Section: user/library
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: gstreamer0.10-plugins-bad
+Description: INdT nuv demux GStreamer plugin
+ This GStreamer plugin permits demux of Nuv streams.
+
+Package: gstreamer0.10-indt-mythtvsrc
+Architecture: any
+Section: user/library
+Depends: ${misc:Depends}, ${shlibs:Depends}, gmyth (>= 0.3)
+Description: INdT mythtv source GStreamer plugin
+ This GStreamer plugin permits read streamer from MythTv Server
+
+Package: maemo-nuvdemux
+Architecture: all
+Section: user/library
+Depends: gstreamer0.10-indt-nuvdemux
+Description: enable support to nuvdemux on osso media server (meta-package)
+ This package is a meta-package that, when installed, guarantees that you
+ have support to nuv files on osso-media-server.
Added: trunk/packages/gst-debian/copyright
===================================================================
--- trunk/packages/gst-debian/copyright (rev 0)
+++ trunk/packages/gst-debian/copyright 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,23 @@
+This package was debianized by Renato Araujo Oliveira Filho <ren...@in...> on
+Thu, 09 Nov 2006 15:58:00 -0300.
+
+Copyright Holder: 2006 INdT
+
+License:
+
+ This package 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; version 2 dated June, 1991.
+
+ This package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Added: trunk/packages/gst-debian/gstreamer0.10-indt-mythtvsrc.install
===================================================================
--- trunk/packages/gst-debian/gstreamer0.10-indt-mythtvsrc.install (rev 0)
+++ trunk/packages/gst-debian/gstreamer0.10-indt-mythtvsrc.install 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/gstreamer-*/*mythtvsrc*.so
Added: trunk/packages/gst-debian/gstreamer0.10-indt-nuvdemux.install
===================================================================
--- trunk/packages/gst-debian/gstreamer0.10-indt-nuvdemux.install (rev 0)
+++ trunk/packages/gst-debian/gstreamer0.10-indt-nuvdemux.install 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/gstreamer-*/*nuvdemux*.so
Added: trunk/packages/gst-debian/maemo-nuvdemux.install
===================================================================
--- trunk/packages/gst-debian/maemo-nuvdemux.install (rev 0)
+++ trunk/packages/gst-debian/maemo-nuvdemux.install 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,2 @@
+debian/nuv.xml usr/share/mime/packages/
+debian/osso_media_server_nuv.schemas usr/share/gconf/schemas
Added: trunk/packages/gst-debian/maemo-nuvdemux.postinst
===================================================================
--- trunk/packages/gst-debian/maemo-nuvdemux.postinst (rev 0)
+++ trunk/packages/gst-debian/maemo-nuvdemux.postinst 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,24 @@
+#! /bin/sh
+set -e
+
+#DEBHELPER#
+
+# Register our X Desktop Group Shared MIME-info Database info
+if [ -x /usr/bin/update-mime-database ] ; then
+ /usr/bin/update-mime-database /usr/share/mime
+fi
+
+# Register a new type on Osso Media Server
+if [ -x /usr/bin/gconftool-2 ] ; then
+ /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/osso_media_server_nuv.schemas
+fi
+
+#append nuv info on osso mediaplayer ui
+data_file=/usr/share/applications/hildon/mp_ui.desktop
+tmp_file=/tmp/mp_ui.desktop
+cat $data_file | sed 's/X-Osso-URI-Actions=rtsp/X-Osso-URI-Actions=rtsp;myth/' | sed 's/MimeType=\(.*\)/MimeType=\1;video\/x-nuv/' > $tmp_file
+echo -e "\n\n[X-Osso-URI-Action Handler myth] \nMethod=mime_open\nName=medi_ap_mediaplayer_name\nTranslationDomain=mediaplayer" >> $tmp_file
+cat $tmp_file > $data_file
+echo "FILE DESKTOP UPDATED"
+
+exit 0
Added: trunk/packages/gst-debian/nuv.xml
===================================================================
--- trunk/packages/gst-debian/nuv.xml (rev 0)
+++ trunk/packages/gst-debian/nuv.xml 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"
+ xmlns:osso="http://nokia.com/osso/mime-categories">
+ <mime-type type="video/x-nuv">
+ <comment>Nuv File</comment>
+ <comment xml:lang="en">Mythtv Nuv file container</comment>
+ <magic priority="60">
+ <match value="MythTVVideo" type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.nuv"/>
+ <osso:category name="video"/>
+ </mime-type>
+</mime-info>
Added: trunk/packages/gst-debian/osso_media_server_nuv.schemas
===================================================================
--- trunk/packages/gst-debian/osso_media_server_nuv.schemas (rev 0)
+++ trunk/packages/gst-debian/osso_media_server_nuv.schemas 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/apps/osso/osso_media_server/demux_video/video_x-nuv</key>
+ <applyto>/apps/osso/osso_media_server/demux_video/video_x-nuv</applyto>
+ <owner>osso_media_server</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[video/x-nuv,nuvdemux]</default>
+ <locale name="C">
+ <short>Play MYTHTV .nuv files.</short>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
Added: trunk/packages/gst-debian/rules
===================================================================
--- trunk/packages/gst-debian/rules (rev 0)
+++ trunk/packages/gst-debian/rules 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# debian package version
+version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+
+maint: debian/control
+
+binary-install/gstreamer0.10-indt-nuvdemux::
+ rm -f debian/gstreamer0.10-indt-nuvdemux/usr/lib/gstreamer-0.10/libgstnuvdemux.la
+ rm -f debian/gstreamer0.10-indt-nuvdemux/usr/lib/gstreamer-0.10/libgstnuvdemux.a
+ rm -f debian/gstreamer0.10-indt-nuvdemux/usr/lib/gstreamer-0.10/libgsttypefindfunctions_indt.la
+ rm -f debian/gstreamer0.10-indt-nuvdemux/usr/lib/gstreamer-0.10/libgsttypefindfunctions_indt.a
+
+.PHONY: maint
Property changes on: trunk/packages/gst-debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/README.Debian
===================================================================
--- trunk/packages/gvfs-debian/README.Debian (rev 0)
+++ trunk/packages/gvfs-debian/README.Debian 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,6 @@
+libgnomevfs2-mythtv for Debian
+------------------
+
+This package provides the libgnomevfs2 mythtv modules.
+
+ -- Hallyson Melo <hal...@in...>, Tue, 20 Oct 2006 10:53:12 -0300
Property changes on: trunk/packages/gvfs-debian/README.Debian
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/changelog
===================================================================
--- trunk/packages/gvfs-debian/changelog (rev 0)
+++ trunk/packages/gvfs-debian/changelog 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,21 @@
+libgnomevfs2-mythtv (0.7-indt1) unstable; urgency=low
+
+ * Updated version to 0.7;
+
+ -- Hallyson Melo <hal...@in...> Mon, 04 Feb 2008 15:19:00 -0300
+
+libgnomevfs2-mythtv (0.3-indt1) unstable; urgency=low
+
+ * Some bugs fixed
+ * Livetv improved
+ * API updated to gmyth-0.3
+ * Added some tests
+
+ -- Hallyson Melo <hal...@in...> Mon, 14 May 2007 18:12:58 -0300
+
+libgnomevfs2-mythtv (0.1.1) unstable; urgency=low
+
+ * Initial release
+
+ -- Hallyson Melo <hal...@in...> Tue, 20 Oct 2006 10:53:12 -0300
+
Property changes on: trunk/packages/gvfs-debian/changelog
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/compat
===================================================================
--- trunk/packages/gvfs-debian/compat (rev 0)
+++ trunk/packages/gvfs-debian/compat 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1 @@
+4
Property changes on: trunk/packages/gvfs-debian/compat
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/control
===================================================================
--- trunk/packages/gvfs-debian/control (rev 0)
+++ trunk/packages/gvfs-debian/control 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,15 @@
+Source: libgnomevfs2-mythtv
+Priority: optional
+Maintainer: Hallyson Melo <hal...@in...>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), libglib2.0-dev, gmyth-dev (>= 0.3)
+Standards-Version: 3.6.1
+Section: user/library
+
+Package: libgnomevfs2-mythtv
+Section: user/library
+Architecture: any
+Depends: libglib2.0-0, gmyth (>= 0.3)
+Description: libgnomevfs2-mythtv
+ Contains the gnomevfs2 modules for Mythtv protocol. It allows access backend recorded program files and livetv.
+ .
+ This package contains the libgnomevfs2 mythtv modules.
Property changes on: trunk/packages/gvfs-debian/control
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/copyright
===================================================================
--- trunk/packages/gvfs-debian/copyright (rev 0)
+++ trunk/packages/gvfs-debian/copyright 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,23 @@
+This package was debianized by Hallyson Melo <hal...@in...> on
+Tue, 16 May 2006 10:53:12 -0300.
+
+Copyright Holder: 2006 INdT
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
Property changes on: trunk/packages/gvfs-debian/copyright
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/dirs
===================================================================
--- trunk/packages/gvfs-debian/dirs (rev 0)
+++ trunk/packages/gvfs-debian/dirs 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,2 @@
+usr/lib/gnome-vfs-2.0/modules/
+etc/gnome-vfs-2.0/modules/
Property changes on: trunk/packages/gvfs-debian/dirs
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gvfs-debian/rules
===================================================================
--- trunk/packages/gvfs-debian/rules (rev 0)
+++ trunk/packages/gvfs-debian/rules 2008-02-04 18:23:49 UTC (rev 918)
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# debian package version
+version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+
+maint: debian/control
+
+common_conf_flags = \
+ --disable-debug
+
+# FIXME: should disable docs for arch only builds
+DEB_CONFIGURE_EXTRA_FLAGS := $(common_conf_flags)
+
+DEB_INSTALL_DOCS_ALL += debian/README.Debian NEWS
+
+.PHONY: maint
Property changes on: trunk/packages/gvfs-debian/rules
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-04 18:18:04
|
Revision: 917
http://gmyth.svn.sourceforge.net/gmyth/?rev=917&view=rev
Author: renatofilho
Date: 2008-02-04 10:18:05 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
Creating branche 0.7.0
Added Paths:
-----------
branches/release-0.7.0/
Copied: branches/release-0.7.0 (from rev 916, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-02 23:22:50
|
Revision: 916
http://gmyth.svn.sourceforge.net/gmyth/?rev=916&view=rev
Author: renatofilho
Date: 2008-02-02 15:22:44 -0800 (Sat, 02 Feb 2008)
Log Message:
-----------
fixed gmyth.h corruption
Modified Paths:
--------------
trunk/gmyth/src/gmyth.h
Modified: trunk/gmyth/src/gmyth.h
===================================================================
--- trunk/gmyth/src/gmyth.h 2008-02-01 22:17:33 UTC (rev 915)
+++ trunk/gmyth/src/gmyth.h 2008-02-02 23:22:44 UTC (rev 916)
@@ -7,22 +7,22 @@
* Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
* @author Renato Filho <ren...@in...>
*
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-01 19:22:15
|
Revision: 914
http://gmyth.svn.sourceforge.net/gmyth/?rev=914&view=rev
Author: renatofilho
Date: 2008-02-01 11:22:17 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
fixed gmyth version on configure
Modified Paths:
--------------
trunk/gmyth-dbus/configure.ac
Modified: trunk/gmyth-dbus/configure.ac
===================================================================
--- trunk/gmyth-dbus/configure.ac 2008-02-01 19:21:52 UTC (rev 913)
+++ trunk/gmyth-dbus/configure.ac 2008-02-01 19:22:17 UTC (rev 914)
@@ -3,7 +3,7 @@
AC_PREREQ(2.50)
-AC_INIT([gmyth-dbus],[0.1])
+AC_INIT([gmyth-dbus],[0.7])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(config.h)
@@ -65,7 +65,7 @@
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(GMYTH, gmyth, HAVE_GMYTH=yes, HAVE_GMYTH=no)
+PKG_CHECK_MODULES(GMYTH, gmyth >= 0.7, HAVE_GMYTH=yes, HAVE_GMYTH=no)
if test "x$HAVE_GMYTH" = "xno"; then
AC_MSG_ERROR(you need libgmyth-dev installed)
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-01 19:21:49
|
Revision: 913
http://gmyth.svn.sourceforge.net/gmyth/?rev=913&view=rev
Author: renatofilho
Date: 2008-02-01 11:21:52 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
fixed gmyth version on control packages
Modified Paths:
--------------
trunk/packages/gmyth-dbus-debian/control
Modified: trunk/packages/gmyth-dbus-debian/control
===================================================================
--- trunk/packages/gmyth-dbus-debian/control 2008-02-01 14:32:18 UTC (rev 912)
+++ trunk/packages/gmyth-dbus-debian/control 2008-02-01 19:21:52 UTC (rev 913)
@@ -1,13 +1,13 @@
Source: gmyth-dbus
Priority: optional
Maintainer: Hallyson Melo <hal...@in...>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.6), libdbus-glib-1-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.7), libdbus-glib-1-dev
Standards-Version: 3.6.2
Section: user/library
Package: gmyth-dbus
Section: user/library
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.6), libdbus-glib-1-2
+Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.7), libdbus-glib-1-2
Description: The gmyth dbus interface.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-01 14:32:21
|
Revision: 912
http://gmyth.svn.sourceforge.net/gmyth/?rev=912&view=rev
Author: renatofilho
Date: 2008-02-01 06:32:18 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
removed project maemo-ui-old
Removed Paths:
-------------
trunk/maemo-ui-old/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-01 14:30:18
|
Revision: 911
http://gmyth.svn.sourceforge.net/gmyth/?rev=911&view=rev
Author: renatofilho
Date: 2008-02-01 06:30:21 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
created release 0.7; moved debian dir to packages project
Modified Paths:
--------------
trunk/gmyth/configure.ac
trunk/gmyth/src/gmyth_socket.c
trunk/gmyth-stream/gmencoder/src/gmencoder.c
trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
trunk/gst-gmyth/debian/changelog
Added Paths:
-----------
trunk/packages/
trunk/packages/gmencoder-debian/
trunk/packages/gmencoder-debian/README.Debian
trunk/packages/gmencoder-debian/changelog
trunk/packages/gmencoder-debian/compat
trunk/packages/gmencoder-debian/control
trunk/packages/gmencoder-debian/copyright
trunk/packages/gmencoder-debian/docs
trunk/packages/gmencoder-debian/rules
trunk/packages/gms-debian/
trunk/packages/gms-debian/changelog
trunk/packages/gms-debian/compat
trunk/packages/gms-debian/control
trunk/packages/gms-debian/copyright
trunk/packages/gms-debian/gms.install
trunk/packages/gms-debian/gms.postinst
trunk/packages/gms-debian/gms.postrm
trunk/packages/gms-debian/rules
trunk/packages/gmyth-dbus-debian/
trunk/packages/gmyth-dbus-debian/changelog
trunk/packages/gmyth-dbus-debian/compat
trunk/packages/gmyth-dbus-debian/control
trunk/packages/gmyth-dbus-debian/rules
trunk/packages/gmyth-debian/
trunk/packages/gmyth-debian/changelog
trunk/packages/gmyth-debian/compat
trunk/packages/gmyth-debian/control
trunk/packages/gmyth-debian/gmyth-dev.install
trunk/packages/gmyth-debian/gmyth-utils.install
trunk/packages/gmyth-debian/gmyth.install
trunk/packages/gmyth-debian/rules
Removed Paths:
-------------
trunk/gmyth/debian/
trunk/gmyth-dbus/debian/
trunk/gmyth-stream/gmencoder/debian/
trunk/gmyth-stream/server/debian/
Modified: trunk/gmyth/configure.ac
===================================================================
--- trunk/gmyth/configure.ac 2008-02-01 13:38:20 UTC (rev 910)
+++ trunk/gmyth/configure.ac 2008-02-01 14:30:21 UTC (rev 911)
@@ -298,17 +298,8 @@
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
-#pkg debian flags
-DISTRIB_CODENAME="$(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d'=' -f2)"
-if test "x$DISTRIB_CODENAME" = "x"; then
- DISTRIB_CODENAME="chinook"
-fi
-AC_SUBST(DISTRIB_CODENAME)
-
-
AC_OUTPUT([
Makefile
-debian/changelog
src/Makefile
samples/Makefile
tests/Makefile
Modified: trunk/gmyth/src/gmyth_socket.c
===================================================================
--- trunk/gmyth/src/gmyth_socket.c 2008-02-01 13:38:20 UTC (rev 910)
+++ trunk/gmyth/src/gmyth_socket.c 2008-02-01 14:30:21 UTC (rev 911)
@@ -521,7 +521,7 @@
const gchar * hostname, gint port)
{
return gmyth_socket_connect_with_timeout(gmyth_socket, hostname, port,
- 0);
+ 30);
}
gboolean
@@ -573,6 +573,11 @@
/*
* init socket descriptor
*/
+
+ g_debug ("FAMILY: %d, TYPE: %d, PROTOCOL: %d",
+ addr_info0->ai_family,
+ addr_info0->ai_socktype,
+ addr_info0->ai_protocol);
gmyth_socket->sd =
socket(addr_info0->ai_family, addr_info0->ai_socktype,
addr_info0->ai_protocol);
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-01 13:38:20 UTC (rev 910)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-01 14:30:21 UTC (rev 911)
@@ -503,7 +503,8 @@
vcaps = gst_caps_new_simple("video/x-raw-yuv",
"framerate", GST_TYPE_FRACTION,
- (int) (fps * 1000), 1000, NULL);
+ (int) (fps * 1000), 1000,
+ NULL);
if (gst_element_link_filtered(vrate, vencode, vcaps) == FALSE) {
g_warning("Fail to link vrate with vencode.");
@@ -1231,8 +1232,8 @@
GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(user_data);
if (priv->timeout_id != 0) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
+ g_source_remove (priv->timeout_id);
+ priv->timeout_id = 0;
}
if (priv->send_chunked) {
Modified: trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
===================================================================
--- trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2008-02-01 13:38:20 UTC (rev 910)
+++ trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2008-02-01 14:30:21 UTC (rev 911)
@@ -55,8 +55,6 @@
self._insert_param("--audio-opts", self.params_first ("audio-opts", ""))
self._insert_param("--mux-element", self.params_first("mux", ""))
self._insert_param("--audio-rate", self.params_first("audio-rate", ""))
-
-
# _parse_params
def start(self, outfd):
@@ -84,9 +82,9 @@
return False
try:
- if not outfile:
- p = select.poll()
- p.register (outfd, select.POLLNVAL | select.POLLERR |
+ if not outfile:
+ p = select.poll()
+ p.register (outfd, select.POLLNVAL | select.POLLERR |
select.POLLHUP)
tries = 0
while (self.proc and self.proc.poll() == None):
Modified: trunk/gst-gmyth/debian/changelog
===================================================================
--- trunk/gst-gmyth/debian/changelog 2008-02-01 13:38:20 UTC (rev 910)
+++ trunk/gst-gmyth/debian/changelog 2008-02-01 14:30:21 UTC (rev 911)
@@ -1,3 +1,9 @@
+gstreamer0.10-indt-plugins (0.10.14-svn20080107) gutsy; urgency=low
+
+ * Relase 01/07/2007;
+
+ -- Renato Araujo Oliveira Filho <ren...@in...> Mon, 07 Jan 2008 10:38:00 -0300
+
gstreamer0.10-indt-plugins (0.10.2-svn20070914) unstable; urgency=low
* Initial packaged;
Added: trunk/packages/gmencoder-debian/README.Debian
===================================================================
--- trunk/packages/gmencoder-debian/README.Debian (rev 0)
+++ trunk/packages/gmencoder-debian/README.Debian 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,6 @@
+gmencoder for Debian
+--------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Hallyson Melo <hal...@in...> Mon, 17 Sep 2007 16:44:13 -0300
Added: trunk/packages/gmencoder-debian/changelog
===================================================================
--- trunk/packages/gmencoder-debian/changelog (rev 0)
+++ trunk/packages/gmencoder-debian/changelog 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,24 @@
+gmencoder (0.7-indt1) gutsy; urgency=low
+
+ * Updated to same gmyth Release 0.7
+
+ -- Renato Filho <ren...@in...> Fri, 01 Feb 2008 11:00:00 -0300
+
+gmencoder (0.2-indt2) gutsy; urgency=low
+
+ * Bugs fix
+
+ -- Hallyson Melo <hal...@in...> Wed, 07 Jan 2008 10:35:00 -0300
+
+gmencoder (0.1-indt1) gutsy; urgency=low
+
+ * release 11/21/2007
+
+ -- Hallyson Melo <hal...@in...> Wed, 17 Sep 2007 17:12:00 -0300
+
+gmencoder (0.1-indt1) unstable; urgency=low
+
+ * Initial release
+
+ -- Hallyson Melo <hal...@in...> Mon, 17 Sep 2007 16:44:13 -0300
+
Added: trunk/packages/gmencoder-debian/compat
===================================================================
--- trunk/packages/gmencoder-debian/compat (rev 0)
+++ trunk/packages/gmencoder-debian/compat 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1 @@
+5
Added: trunk/packages/gmencoder-debian/control
===================================================================
--- trunk/packages/gmencoder-debian/control (rev 0)
+++ trunk/packages/gmencoder-debian/control 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,12 @@
+Source: gmencoder
+Section: user/multimedia
+Priority: extra
+Maintainer: Hallyson Melo <hal...@in...>
+Build-Depends: debhelper (>= 5), autotools-dev, libgstreamer-plugins-base0.10-dev, libglib2.0-dev, libgnomevfs2-dev
+Standards-Version: 3.7.2
+
+Package: gmencoder
+Section: user/multimedia
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgstreamer-plugins-base0.10-0, libglib2.0-0, libgnomevfs2-0
+Description: GMencoder is an application similar to mencoder, but it uses gstreamer as its backend engine.
Added: trunk/packages/gmencoder-debian/copyright
===================================================================
--- trunk/packages/gmencoder-debian/copyright (rev 0)
+++ trunk/packages/gmencoder-debian/copyright 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,22 @@
+This package was debianized by Hallyson Melo <hal...@in...> on
+Mon, 17 Sep 2007 16:44:13 -0300.
+
+It was downloaded from <fill in http/ftp site>
+
+Upstream Author: <put author(s) name and email here>
+
+Copyright: <put the year(s) of the copyright, and the names of the
+ copyright holder(s) here>
+
+License:
+
+<Put the license of the package here>
+
+
+The Debian packaging is (C) 2007, Hallyson Melo <hal...@in...> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+
Added: trunk/packages/gmencoder-debian/docs
===================================================================
--- trunk/packages/gmencoder-debian/docs (rev 0)
+++ trunk/packages/gmencoder-debian/docs 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,2 @@
+NEWS
+README
Added: trunk/packages/gmencoder-debian/rules
===================================================================
--- trunk/packages/gmencoder-debian/rules (rev 0)
+++ trunk/packages/gmencoder-debian/rules 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,107 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+ # Add here commands to configure the package.
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ #docbook-to-man debian/gmencoder.sgml > gmencoder.1
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/gmencoder.
+ $(MAKE) DESTDIR=$(CURDIR)/debian/gmencoder install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: trunk/packages/gmencoder-debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gms-debian/changelog
===================================================================
--- trunk/packages/gms-debian/changelog (rev 0)
+++ trunk/packages/gms-debian/changelog 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,18 @@
+gms (0.7-indt1) gutsy; urgency=low
+
+ * Updated to same gmyth Release 0.7
+
+ -- Renato Filho <ren...@in...> Fri, 01 Feb 2008 11:00:00 -0300
+
+gms (0.3-indt2) unstable; urgency=low
+
+ * Added gmencoder package as a dependency
+
+ -- Hallyson Melo <hal...@in...> Thu, 16 Aug 2007 15:00:00 -0300
+
+gms (0.3-indt1) unstable; urgency=low
+
+ * First package
+
+ -- Renato Araujo Oliveira Filho <ren...@in...> Thu, 16 Aug 2007 14:55:00 -0300
+
Added: trunk/packages/gms-debian/compat
===================================================================
--- trunk/packages/gms-debian/compat (rev 0)
+++ trunk/packages/gms-debian/compat 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1 @@
+5
Added: trunk/packages/gms-debian/control
===================================================================
--- trunk/packages/gms-debian/control (rev 0)
+++ trunk/packages/gms-debian/control 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,12 @@
+Source: gms
+Section: sound
+Priority: optional
+Maintainer: Renato Araujo Oliveira Filho <ren...@in...>
+Build-Depends: debhelper (>= 5.0.38), python-support (>= 0.5), python-central (>= 0.5)
+Standards-Version: 3.7.2
+
+Package: gms
+Architecture: any
+Depends: ${python:Depends}, gmencoder
+Description: Media transcoder deamon
+ Homepage: http://gmyth.sourceforge.net/
Added: trunk/packages/gms-debian/copyright
===================================================================
--- trunk/packages/gms-debian/copyright (rev 0)
+++ trunk/packages/gms-debian/copyright 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,19 @@
+It was downloaded from: http://gmyth.sourceforge.net/wiki/
+
+License:
+ This package 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 package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License can
+be found in `/usr/share/common-licenses/GPL'.
Added: trunk/packages/gms-debian/gms.install
===================================================================
--- trunk/packages/gms-debian/gms.install (rev 0)
+++ trunk/packages/gms-debian/gms.install 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,8 @@
+debian/tmp/usr/share/gms/lib/*.py usr/share/gms/lib
+debian/tmp/usr/share/gms/plugins/*.py usr/share/gms/plugins
+debian/tmp/usr/share/gms/plugins/transcoders/*.py usr/share/gms/plugins/transcoders
+debian/tmp/usr/share/gms/plugins/transcoders/mencoder_lib/*.py usr/share/gms/plugins/transcoders/mencoder_lib
+debian/tmp/usr/share/gms/html/* usr/share/gms/html
+debian/tmp/usr/bin/* usr/bin
+debian/etc/init.d/gmsd etc/init.d
+debian/etc/gms/*.conf etc/gms/
Property changes on: trunk/packages/gms-debian/gms.install
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gms-debian/gms.postinst
===================================================================
--- trunk/packages/gms-debian/gms.postinst (rev 0)
+++ trunk/packages/gms-debian/gms.postinst 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,29 @@
+#! /bin/sh
+# postinst script for gms
+
+set -e
+
+case "$1" in
+ configure)
+ if ! getent passwd gms >/dev/null; then
+ adduser --disabled-password --quiet --system \
+ --home /var/gms-media \
+ --gecos "GMS media dir" --group gms
+ fi
+ if ! getent passwd gms | grep -q /var/run/gms; then
+ usermod -d /var/gms-media gms
+ fi
+ update-rc.d gmsd defaults
+ invoke-rc.d gmsd start
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/gms-debian/gms.postrm
===================================================================
--- trunk/packages/gms-debian/gms.postrm (rev 0)
+++ trunk/packages/gms-debian/gms.postrm 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] ; then
+ invoke-rc.d --force gms stop
+ deluser --quiet --system gms > /dev/null || true
+ delgroup --quiet --system gms > /dev/null || true
+fi
+
+exit 0
Added: trunk/packages/gms-debian/rules
===================================================================
--- trunk/packages/gms-debian/rules (rev 0)
+++ trunk/packages/gms-debian/rules 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PYVER=2.5
+PYTHON=python$(PYVER)
+
+PREFIX=debian/tmp
+
+build: build-stamp
+
+build-stamp:
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_clean -k
+
+ @rm -rf build
+ @$(PYTHON) setup.py install --prefix=$(PREFIX)/usr --no-compile --install-purelib=$(PREFIX)/usr/share/gms
+ install -D -o root -g root -m 755 $(PREFIX)/usr/etc/init.d/gmsd debian/$(cdbs_curpkg)/etc/init.d/gmsd
+ install -D -o root -g root -m 755 $(PREFIX)/usr/etc/gms/server.conf debian/$(cdbs_curpkg)/etc/gms/server.conf
+
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep
+.PHONY: clean binary-indep binary install
+
Property changes on: trunk/packages/gms-debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gmyth-dbus-debian/changelog
===================================================================
--- trunk/packages/gmyth-dbus-debian/changelog (rev 0)
+++ trunk/packages/gmyth-dbus-debian/changelog 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,36 @@
+gmyth-dbus (0.7-indt1) gutsy; urgency=low
+
+ * Updated to same gmyth Release 0.7
+
+ -- Renato Filho <ren...@in...> Fri, 01 Feb 2008 11:00:00 -0300
+
+gmyth-dbus (0.1.4) unstable; urgency=low
+
+ * Fixed dbus interface bug for add_exception function.
+
+ -- Hallyson <hal...@nd...> Fri, 01 Feb 2008 10:35:55 -0300
+
+gmyth-dbus (0.1.3) unstable; urgency=low
+
+ * updated to gmyth 0.6;
+
+ -- Hallyson Melo <hal...@in...> Fri, 23 Jan 2008 17:08:00 -0300
+
+gmyth-dbus (0.1.2) unstable; urgency=low
+
+ * Release 11/19/2007;
+
+ -- Hallyson Melo <hal...@in...> Fri, 11 Nov 2007 15:00:00 -0300
+
+gmyth-dbus (0.1.1) unstable; urgency=low
+
+ * Implemented error propagation;
+
+ -- Hallyson Melo <hal...@in...> Fri, 29 Oct 2006 14:00:16 -0300
+
+gmyth-dbus (0.1) unstable; urgency=low
+
+ * Initial Package.
+
+ -- Hallyson Melo <hal...@in...> Fri, 25 Oct 2006 14:00:16 -0300
+
Added: trunk/packages/gmyth-dbus-debian/compat
===================================================================
--- trunk/packages/gmyth-dbus-debian/compat (rev 0)
+++ trunk/packages/gmyth-dbus-debian/compat 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1 @@
+4
Added: trunk/packages/gmyth-dbus-debian/control
===================================================================
--- trunk/packages/gmyth-dbus-debian/control (rev 0)
+++ trunk/packages/gmyth-dbus-debian/control 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,13 @@
+Source: gmyth-dbus
+Priority: optional
+Maintainer: Hallyson Melo <hal...@in...>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.6), libdbus-glib-1-dev
+Standards-Version: 3.6.2
+Section: user/library
+
+Package: gmyth-dbus
+Section: user/library
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.6), libdbus-glib-1-2
+Description: The gmyth dbus interface.
+
Added: trunk/packages/gmyth-dbus-debian/rules
===================================================================
--- trunk/packages/gmyth-dbus-debian/rules (rev 0)
+++ trunk/packages/gmyth-dbus-debian/rules 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# debian package version
+version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+
+maint: debian/control
+
+common_conf_flags = \
+ --disable-debug
+
+# FIXME: should disable docs for arch only builds
+DEB_CONFIGURE_EXTRA_FLAGS := $(common_conf_flags)
+
+
+.PHONY: maint
Property changes on: trunk/packages/gmyth-dbus-debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/gmyth-debian/changelog
===================================================================
--- trunk/packages/gmyth-debian/changelog (rev 0)
+++ trunk/packages/gmyth-debian/changelog 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,53 @@
+gmyth (0.7-indt1) gutsy; urgency=low
+
+ * Release 0.7
+
+ -- Renato Araujo <ren...@in...> Fri, 01 Feb 2008 11:00:08 -0300
+
+gmyth (0.6-indt1) @DISTRIB_CODENAME@; urgency=low
+
+ * changed types of channel_id, program_id;
+
+ -- Renato Araujo <ren...@in...> Fri, 23 Jan 2008 17:06:08 -0300
+
+gmyth (0.5-indt1) @DISTRIB_CODENAME@; urgency=low
+
+ * bug fixes;
+
+ -- Renato Araujo <ren...@in...> Fri, 04 Jan 2008 11:16:08 -0300
+
+gmyth (0.4.2-chinook-indt1) unstable; urgency=low
+
+ * Patch from Tim Philipp to fix debian/control libcurl dependency
+
+ -- Hallyson Melo <hal...@in...> Mon, 08 Oct 2007 10:49:19 -0300
+
+gmyth (0.4-indt1) unstable; urgency=low
+
+ * Bug fixes
+ * Improvements in the schedule management (add all schedule, add exception, ...)
+ * GMythBackendInfo now has db_port
+
+ -- Hallyson Melo <hal...@in...> Thu, 22 Aug 2007 14:46:08 -0300
+
+gmyth (0.3) unstable; urgency=low
+
+ * Update file_reader an serveral bug fixes;
+
+ -- Renato Araujo <ren...@in...> Thu, 12 Apr 2007 14:46:08 -0300
+
+gmyth (0.2) unstable; urgency=low
+
+ * Included several http_requests in order to replace mysql queries (MythProtocol >= 33)
+ * Included remote file transcoding request and jobqueue request (need to apply patch)
+ * Included recording profile management (need to apply patch)
+ * Several bug fixes
+
+ -- Hallyson Melo <hal...@in...> Mon, 5 Mar 2007 14:46:08 -0300
+
+gmyth (0.1) unstable; urgency=low
+
+ * Initial Maemo Package.
+
+ -- Hallyson Melo <hal...@in...> Fri, 15 Sep 2006 10:26:16 -0300
+
Added: trunk/packages/gmyth-debian/compat
===================================================================
--- trunk/packages/gmyth-debian/compat (rev 0)
+++ trunk/packages/gmyth-debian/compat 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1 @@
+4
Added: trunk/packages/gmyth-debian/control
===================================================================
--- trunk/packages/gmyth-debian/control (rev 0)
+++ trunk/packages/gmyth-debian/control 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,25 @@
+Source: gmyth
+Priority: optional
+Maintainer: Hallyson Melo <hal...@in...>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), libcurl3-dev | libcurl4-gnutls-dev, libxml2-dev, libglib2.0-dev, libmysqlclient15-dev | libmysqlclient14-dev
+Standards-Version: 3.6.2
+Section: user/library
+
+Package: gmyth
+Section: user/library
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3 | libcurl4-gnutls, libxml2, libglib2.0-0, libmysqlclient15 | libmysqlclient15off | libmysqlclient14
+Description: The gmyth library binary files. GMyth is a library intended to access mythtv backend functionalities from a glib/gobject perspective. It includes access to the program guide, recorded programs, scheduling, etc.
+
+Package: gmyth-dev
+Section: user/library
+Architecture: any
+Depends: gmyth (= ${Source-Version}), libcurl3-dev | libcurl4-gnutls-dev, libxml2-dev, libglib2.0-dev, libmysqlclient15-dev | libmysqlclient14-dev
+Description: The gmyth library development files. GMyth is a library intended to access mythtv backend functionalities from a glib/gobject perspective. It includes access to the program guide, recorded programs, scheduling, etc.
+
+Package: gmyth-utils
+Section: user/multimedia
+Architecture: any
+Depends: gmyth (= ${binary:Version})
+Description: The gmyth utils package. It contain the application gmyth-cat.
+
Added: trunk/packages/gmyth-debian/gmyth-dev.install
===================================================================
--- trunk/packages/gmyth-debian/gmyth-dev.install (rev 0)
+++ trunk/packages/gmyth-debian/gmyth-dev.install 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,6 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/share/pkgconfig/*
Added: trunk/packages/gmyth-debian/gmyth-utils.install
===================================================================
--- trunk/packages/gmyth-debian/gmyth-utils.install (rev 0)
+++ trunk/packages/gmyth-debian/gmyth-utils.install 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/*
Added: trunk/packages/gmyth-debian/gmyth.install
===================================================================
--- trunk/packages/gmyth-debian/gmyth.install (rev 0)
+++ trunk/packages/gmyth-debian/gmyth.install 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
Added: trunk/packages/gmyth-debian/rules
===================================================================
--- trunk/packages/gmyth-debian/rules (rev 0)
+++ trunk/packages/gmyth-debian/rules 2008-02-01 14:30:21 UTC (rev 911)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# debian package version
+version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+
+maint: debian/control
+
+common_conf_flags = \
+ --disable-debug
+
+# FIXME: should disable docs for arch only builds
+DEB_CONFIGURE_EXTRA_FLAGS := $(common_conf_flags)
+
+
+.PHONY: maint
Property changes on: trunk/packages/gmyth-debian/rules
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2008-02-01 13:38:22
|
Revision: 910
http://gmyth.svn.sourceforge.net/gmyth/?rev=910&view=rev
Author: melunko
Date: 2008-02-01 05:38:20 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
fixed dbus xml interface bug for add_exception function
Modified Paths:
--------------
trunk/gmyth-dbus/debian/changelog
trunk/gmyth-dbus/src/gmyth-dbus-server.c
trunk/gmyth-dbus/src/gmyth-dbus-server.xml
Modified: trunk/gmyth-dbus/debian/changelog
===================================================================
--- trunk/gmyth-dbus/debian/changelog 2008-01-31 20:02:39 UTC (rev 909)
+++ trunk/gmyth-dbus/debian/changelog 2008-02-01 13:38:20 UTC (rev 910)
@@ -1,3 +1,9 @@
+gmyth-dbus (0.1.4) unstable; urgency=low
+
+ * Fixed dbus interface bug for add_exception function.
+
+ -- Hallyson <hal...@nd...> Fri, 01 Feb 2008 10:35:55 -0300
+
gmyth-dbus (0.1.3) unstable; urgency=low
* updated to gmyth 0.6;
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-01-31 20:02:39 UTC (rev 909)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-02-01 13:38:20 UTC (rev 910)
@@ -82,7 +82,7 @@
/* Dbus */
static gboolean gmyth_dbus_server_connect (GObject *obj,
const gchar *host,
- guint port,
+ gint port,
const gchar *user,
const gchar *password,
GError **error);
@@ -139,7 +139,7 @@
gboolean *result,
GError **error);
static gboolean gmyth_dbus_server_add_schedule (GObject *obj,
- guint channel_id,
+ gint channel_id,
const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
@@ -149,7 +149,7 @@
GError **error);
static gboolean gmyth_dbus_server_add_exception (GObject *obj,
guint schedule_id,
- guint channel_id,
+ gint channel_id,
const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
@@ -290,7 +290,7 @@
static gboolean
gmyth_dbus_server_connect (GObject *obj,
const gchar *host,
- guint port,
+ gint port,
const gchar *user,
const gchar *password,
GError **error)
@@ -1046,7 +1046,7 @@
static gboolean
gmyth_dbus_server_add_schedule (GObject *obj,
- guint channel_id,
+ gint channel_id,
const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
@@ -1073,14 +1073,13 @@
g_time_val_from_iso8601 (start_time, &start_vtime);
g_time_val_from_iso8601 (end_time, &end_vtime);
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
sch_info = gmyth_dbus_server_new_schedule_info (description,
channel_id,
program_id,
&start_vtime,
&end_vtime);
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
if (sch_info != NULL) {
GMythScheduleType type;
GTimeVal t_now;
@@ -1092,20 +1091,17 @@
g_get_current_time (&t_now);
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
has_record = gmyth_scheduler_was_recorded_before (priv->myth_scheduler,
channel_id,
(time_t) start_vtime.tv_sec);
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
if ((t_now.tv_sec >= start_vtime.tv_sec)
&& (t_now.tv_sec <= end_vtime.tv_sec) && has_record)
{
GMythSocket *socket;
gboolean res = FALSE;
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
socket = gmyth_backend_info_get_connected_socket (priv->myth_backend);
res = gmyth_scheduler_reactivate_schedule(priv->myth_scheduler,
channel_id,
@@ -1113,21 +1109,17 @@
if (res) {
GMythStringList *slist = gmyth_string_list_new();
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
gmyth_string_list_append_char_array(slist, "RESCHEDULE_RECORDINGS 0");
gmyth_socket_sendreceive_stringlist(socket, slist);
res = (gmyth_string_list_get_int(slist, 0) == 1);
g_object_unref(slist);
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
}
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
g_object_unref(socket);
return res;
}
else
{
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
if (!gmyth_scheduler_add_schedule_full (priv->myth_scheduler,
sch_info,
type))
@@ -1136,11 +1128,8 @@
return FALSE;
}
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
(*schedule_id) = sch_info->schedule_id;
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
gmyth_schedule_info_free (sch_info);
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
return TRUE;
}
}
@@ -1150,7 +1139,7 @@
static gboolean
gmyth_dbus_server_add_exception (GObject *obj,
guint schedule_id,
- guint channel_id,
+ gint channel_id,
const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.xml
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-01-31 20:02:39 UTC (rev 909)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-02-01 13:38:20 UTC (rev 910)
@@ -84,8 +84,8 @@
<method name="AddException">
<arg type="u" name="schedule_id" direction="in" />
+ <arg type="i" name="channel_id" direction="in" />
<arg type="s" name="program_id" direction="in" />
- <arg type="i" name="channel_id" direction="in" />
<arg type="s" name="start_time" direction="in" />
<arg type="s" name="end_time" direction="in" />
<arg type="s" name="description" direction="in" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2008-01-31 20:02:36
|
Revision: 909
http://gmyth.svn.sourceforge.net/gmyth/?rev=909&view=rev
Author: melunko
Date: 2008-01-31 12:02:39 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
Makefile fixed for wrong file name gmyth-debug instead of gmyth_debug
Modified Paths:
--------------
trunk/gmyth-dbus/src/Makefile.am
Modified: trunk/gmyth-dbus/src/Makefile.am
===================================================================
--- trunk/gmyth-dbus/src/Makefile.am 2008-01-31 19:56:16 UTC (rev 908)
+++ trunk/gmyth-dbus/src/Makefile.am 2008-01-31 20:02:39 UTC (rev 909)
@@ -4,8 +4,8 @@
gmythdbus_SOURCES = \
gmyth-dbus-server.h \
gmyth-dbus-server.c \
- gmyth-debug.h \
- gmyth-debug.c \
+ gmyth_debug.h \
+ gmyth_debug.c \
main.c
gmythdbus_LDADD = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-31 19:56:16
|
Revision: 908
http://gmyth.svn.sourceforge.net/gmyth/?rev=908&view=rev
Author: renatofilho
Date: 2008-01-31 11:56:16 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
added gmyth-debug functions
Added Paths:
-----------
trunk/gmyth-dbus/src/gmyth_debug.c
trunk/gmyth-dbus/src/gmyth_debug.h
Added: trunk/gmyth-dbus/src/gmyth_debug.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth_debug.c (rev 0)
+++ trunk/gmyth-dbus/src/gmyth_debug.c 2008-01-31 19:56:16 UTC (rev 908)
@@ -0,0 +1,58 @@
+/**
+ * GMyth Library
+ *
+ * @file gmyth/gmyth_debug.c
+ *
+ *
+ * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
+ * @author Renato Filho <ren...@in...>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 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 Lesser 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
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gmyth_debug.h"
+
+void
+gmyth_debug_real(const char *func,
+ const char *file, const int line, gboolean newline,
+ const char *format, ...)
+{
+ va_list args;
+ char buffer[1025];
+ char str_time[255];
+ time_t the_time;
+
+
+ if (g_getenv ("GMYTH-DEBUG"))
+ {
+ va_start(args, format);
+
+ g_vsnprintf(buffer, 1024, format, args);
+
+ va_end(args);
+
+ time(&the_time);
+ strftime(str_time, 254, "%H:%M:%S", localtime(&the_time));
+
+ g_printerr(newline ? "(%s) [%p] [%s] %s:%d: %s\n" :
+ "(%s) [%p] [%s] %s:%d: %s", str_time, g_thread_self(), func,
+ file, line, buffer);
+ }
+}
Added: trunk/gmyth-dbus/src/gmyth_debug.h
===================================================================
--- trunk/gmyth-dbus/src/gmyth_debug.h (rev 0)
+++ trunk/gmyth-dbus/src/gmyth_debug.h 2008-01-31 19:56:16 UTC (rev 908)
@@ -0,0 +1,42 @@
+/**
+ * GMyth Library
+ *
+ * @file gmyth/gmyth_debug.h
+ *
+ *
+ * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
+ * @author Renato Filho <ren...@in...>
+ *
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 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 Lesser 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
+ */
+
+#ifndef __GMYTH_DEBUG_H__
+#define __GMYTH_DEBUG_H__
+
+#include <stdarg.h>
+#include <glib.h>
+#include <time.h>
+
+G_BEGIN_DECLS
+#define gmyth_debug(...) gmyth_debug_real (__FUNCTION__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
+void
+gmyth_debug_real(const char *func,
+ const char *file, int line, gboolean newline,
+ const char *format, ...)
+G_GNUC_PRINTF(5, 6);
+
+G_END_DECLS
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-31 13:19:28
|
Revision: 907
http://gmyth.svn.sourceforge.net/gmyth/?rev=907&view=rev
Author: renatofilho
Date: 2008-01-31 05:19:29 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
created readme file
Added Paths:
-----------
trunk/gmyth-stream/server/README
Added: trunk/gmyth-stream/server/README
===================================================================
--- trunk/gmyth-stream/server/README (rev 0)
+++ trunk/gmyth-stream/server/README 2008-01-31 13:19:29 UTC (rev 907)
@@ -0,0 +1,60 @@
+General Information
+===================
+
+GMythStream (GMS) is a transcoder server developed in python. It makes live
+transcode of any input video and streams it via HTTP. The media player opens
+an HTTP uri informing the input video location and the desired muxer/video/audio
+formats. The GMS server parses this url and starts to transcode the input video
+using one of the transcode plugins: gmencoder or mencoder. The transcoder output
+is sent to the media player via the HTTP connection.
+
+The client can also request transcode progress and the files already transcoded
+and stored in the server. GMS is currently hardly used as a live transcoder for
+mythtv content (recorded videos and livetv).
+
+GMS is free software, licensed under the GNU GPL.
+
+The official web site is:
+ http://gmyth.sourceforge.net/wiki/index.php/Main_Page
+
+Information about mailing lists can be found at:
+ http://sourceforge.net/projects/gmyth/
+
+Our IRC channel is #gmyth on Freenode (irc.freenode.org).
+
+
+Installation
+============
+
+See the INSTALL file.
+
+How to report bugs
+==================
+
+Bugs should be reported to the GMyth SourceForge bug tracking system.
+(http://sourceforge.net/tracker/?group_id=177106&atid=879914.)
+
+In the bug report please include:
+
+* Information about your system. For instance:
+
+ - GStreamer version
+ - Available GStreamer plugins (run gst-inspect with no arguments)
+
+ And anything else you think is relevant.
+
+* Before you report a bug, it will be useful to know if GStreamer works.
+ If you have playback issues, try running this command:
+
+ $ gst-launch-0.10 playbin uri="file:///path/to/my/musicfile.ogg"
+
+ Just replace /path/to/my/musicfile.ogg with some sound file in this command
+ above.
+
+* How to reproduce the bug.
+
+* If the bug was a crash, the exact text that was printed out when the
+ crash occured, and a trace (which can be obtained by using gdb or bug-buddy).
+ See http://live.gnome.org/GettingTraces for more information on getting
+ stack traces.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2008-01-31 12:50:30
|
Revision: 906
http://gmyth.svn.sourceforge.net/gmyth/?rev=906&view=rev
Author: melunko
Date: 2008-01-31 04:49:56 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
Added gmencoder as a gms dependency
Modified Paths:
--------------
trunk/gmyth-stream/server/debian/changelog
trunk/gmyth-stream/server/debian/control
Modified: trunk/gmyth-stream/server/debian/changelog
===================================================================
--- trunk/gmyth-stream/server/debian/changelog 2008-01-30 21:20:16 UTC (rev 905)
+++ trunk/gmyth-stream/server/debian/changelog 2008-01-31 12:49:56 UTC (rev 906)
@@ -1,3 +1,9 @@
+gms (0.3-indt2) unstable; urgency=low
+
+ * Added gmencoder package as a dependency
+
+ -- Hallyson Melo <hal...@in...> Thu, 16 Aug 2007 15:00:00 -0300
+
gms (0.3-indt1) unstable; urgency=low
* First package
Modified: trunk/gmyth-stream/server/debian/control
===================================================================
--- trunk/gmyth-stream/server/debian/control 2008-01-30 21:20:16 UTC (rev 905)
+++ trunk/gmyth-stream/server/debian/control 2008-01-31 12:49:56 UTC (rev 906)
@@ -7,7 +7,6 @@
Package: gms
Architecture: any
-Depends: ${python:Depends}, libgstreamer0.10-0, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good
-Recommends: gstreamer0.10-plugins-ugly
+Depends: ${python:Depends}, gmencoder
Description: Media transcoder deamon
Homepage: http://gmyth.sourceforge.net/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-30 21:20:13
|
Revision: 905
http://gmyth.svn.sourceforge.net/gmyth/?rev=905&view=rev
Author: renatofilho
Date: 2008-01-30 13:20:16 -0800 (Wed, 30 Jan 2008)
Log Message:
-----------
updated README, AUTHORS, COPYING
Added Paths:
-----------
trunk/gmyth-stream/server/AUTHORS
trunk/gmyth-stream/server/COPYING
Added: trunk/gmyth-stream/server/AUTHORS
===================================================================
--- trunk/gmyth-stream/server/AUTHORS (rev 0)
+++ trunk/gmyth-stream/server/AUTHORS 2008-01-30 21:20:16 UTC (rev 905)
@@ -0,0 +1,2 @@
+morpheuz:Artur Duque de Souza <art...@in...>
+renatofilho:Renato Araujo Oliveira Filho <ren...@in...m>
Added: trunk/gmyth-stream/server/COPYING
===================================================================
--- trunk/gmyth-stream/server/COPYING (rev 0)
+++ trunk/gmyth-stream/server/COPYING 2008-01-30 21:20:16 UTC (rev 905)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) 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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. 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.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+ 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
+convey 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 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This 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 Library General
+Public License instead of this License.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-30 03:36:35
|
Revision: 904
http://gmyth.svn.sourceforge.net/gmyth/?rev=904&view=rev
Author: renatofilho
Date: 2008-01-29 19:36:13 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
updated COPYING file
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/AUTHORS
trunk/gmyth-stream/gmencoder/COPYING
trunk/gmyth-stream/gmencoder/README
trunk/gmyth-stream/gmencoder/src/gmencoder.c
trunk/gmyth-stream/gmencoder/src/gmencoder.h
trunk/gmyth-stream/gmencoder/src/main.c
Modified: trunk/gmyth-stream/gmencoder/AUTHORS
===================================================================
--- trunk/gmyth-stream/gmencoder/AUTHORS 2008-01-29 20:12:30 UTC (rev 903)
+++ trunk/gmyth-stream/gmencoder/AUTHORS 2008-01-30 03:36:13 UTC (rev 904)
@@ -0,0 +1,2 @@
+renatofilho:Renato Araujo Oliveira Filho <ren...@in...m>
+melunko:Hallyson Luiz de Morais Melo <hal...@in...>
Modified: trunk/gmyth-stream/gmencoder/COPYING
===================================================================
--- trunk/gmyth-stream/gmencoder/COPYING 2008-01-29 20:12:30 UTC (rev 903)
+++ trunk/gmyth-stream/gmencoder/COPYING 2008-01-30 03:36:13 UTC (rev 904)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) 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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. 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.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+ 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
+convey 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 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This 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 Library General
+Public License instead of this License.
Modified: trunk/gmyth-stream/gmencoder/README
===================================================================
--- trunk/gmyth-stream/gmencoder/README 2008-01-29 20:12:30 UTC (rev 903)
+++ trunk/gmyth-stream/gmencoder/README 2008-01-30 03:36:13 UTC (rev 904)
@@ -0,0 +1,58 @@
+General Information
+===================
+
+This is GMencoder version 0.1. GMencoder is a media transcode tool,
+based on GStreamer elements.
+
+GMencoder is free software, licensed under the GNU GPL.
+
+The official web site is:
+ http://gmyth.sourceforge.net/wiki/index.php/Main_Page
+
+Information about mailing lists can be found at:
+ http://sourceforge.net/projects/gmyth/
+
+Our IRC channel is #gmyth on Freenode (irc.freenode.org).
+
+
+Installation
+============
+
+See the INSTALL file.
+
+How to report bugs
+==================
+
+Bugs should be reported to the GMyth SourceForge bug tracking system.
+(http://sourceforge.net/tracker/?group_id=177106&atid=879914.)
+
+In the bug report please include:
+
+* Information about your system. For instance:
+
+ - GStreamer version
+ - Available GStreamer plugins (run gst-inspect with no arguments)
+
+ And anything else you think is relevant.
+
+* Before you report a bug, it will be useful to know if GStreamer works.
+ If you have playback issues, try running this command:
+
+ $ gst-launch-0.10 playbin uri="file:///path/to/my/musicfile.ogg"
+
+ Just replace /path/to/my/musicfile.ogg with some sound file in this command
+ above.
+
+* How to reproduce the bug.
+
+* If the bug was a crash, the exact text that was printed out when the
+ crash occured, and a trace (which can be obtained by using gdb or bug-buddy).
+ See http://live.gnome.org/GettingTraces for more information on getting
+ stack traces.
+
+Development
+=======
+
+See the HACKING file.
+
+arch-tag: The typical project user README doc
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-29 20:12:30 UTC (rev 903)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-30 03:36:13 UTC (rev 904)
@@ -1,3 +1,24 @@
+/*
+ * arch-tag: Implementation gmencoder engine
+ *
+ * Copyright (C) 2007 INdT - Renato Filho <ren...@in...>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.h
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.h 2008-01-29 20:12:30 UTC (rev 903)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.h 2008-01-30 03:36:13 UTC (rev 904)
@@ -1,3 +1,24 @@
+/*
+ * arch-tag: Header for gmencoder engine
+ *
+ * Copyright (C) 2007 INdT - Renato Filho <ren...@in...>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
#ifndef __G_MENCODER_H__
#define __G_MENCODER_H__
Modified: trunk/gmyth-stream/gmencoder/src/main.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/main.c 2008-01-29 20:12:30 UTC (rev 903)
+++ trunk/gmyth-stream/gmencoder/src/main.c 2008-01-30 03:36:13 UTC (rev 904)
@@ -1,3 +1,24 @@
+/*
+ * arch-tag: GMencoder main file
+ *
+ * Copyright (C) 2007 INdT - Renato Filho <ren...@in...>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-29 20:12:27
|
Revision: 903
http://gmyth.svn.sourceforge.net/gmyth/?rev=903&view=rev
Author: renatofilho
Date: 2008-01-29 12:12:30 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
implemente audio-rate arg
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-29 18:40:32 UTC (rev 902)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-29 20:12:30 UTC (rev 903)
@@ -311,17 +311,46 @@
goto error;
}
- /*
- * if (rate > 0) { g_object_set (G_OBJECT (aencode), "bitrate", 32,
- * NULL); }
- */
+
gst_bin_add_many(GST_BIN(abin), aqueue, aconvert, aencode, aqueue_src,
NULL);
- if (gst_element_link_many(aqueue, aconvert, aencode, aqueue_src, NULL)
- == FALSE) {
+
+ if (!gst_element_link (aqueue, aconvert))
+ {
g_warning("Not Link audio elements");
+ goto error;
}
+
+ if (rate > 0) {
+ GstCaps *caps;
+
+ caps = gst_caps_new_simple ("audio/x-raw-int",
+ "rate", G_TYPE_INT, rate, NULL);
+ if (!gst_element_link_filtered (aconvert, aencode, caps))
+ {
+ gst_caps_unref (caps);
+ g_warning("Not link rate filter");
+ goto error;
+ }
+
+ gst_caps_unref (caps);
+ }
+ else
+ {
+ if (!gst_element_link (aconvert, aencode))
+ {
+ g_warning ("Fail to link audio elements");
+ goto error;
+ }
+ }
+
+
+ if (!gst_element_link (aencode, aqueue_src))
+ {
+ g_warning("Not Link audio elements");
+ goto error;
+ }
// TODO: apply audio rate
// ghost pad the audio bin
@@ -1021,8 +1050,10 @@
err_str = g_strdup_printf("Error [%d] %s (%s)", error->code,
error->message, debug);
priv->ready = FALSE;
+ /*
g_signal_emit(user_data, g_mencoder_signals[ERROR], 0,
err_str);
+ */
g_free(err_str);
g_clear_error(&error);
g_free(debug);
@@ -1076,7 +1107,8 @@
}
sink_pad = gst_element_get_pad(sink_element, "sink");
- gst_pad_link(pad, sink_pad);
+ if (!gst_pad_is_linked (sink_pad))
+ gst_pad_link(pad, sink_pad);
gst_object_unref(sink_element);
gst_object_unref(sink_pad);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-29 18:40:38
|
Revision: 902
http://gmyth.svn.sourceforge.net/gmyth/?rev=902&view=rev
Author: renatofilho
Date: 2008-01-29 10:40:32 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
fixed var names
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-01-29 18:40:18 UTC (rev 901)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-01-29 18:40:32 UTC (rev 902)
@@ -633,7 +633,7 @@
end_str = g_time_val_to_iso8601 (data->endts);
dbus_g_type_struct_set (&program,
- 0, data->xx_channel_id,
+ 0, data->channel_id,
1, start_str,
2, end_str,
3, data->title->str,
@@ -666,8 +666,8 @@
dbus_g_type_struct_set (val,
0, info->record_id,
- 1, info->xx_program_id->str,
- 2, info->xx_channel_id,
+ 1, info->program_id->str,
+ 2, info->channel_id,
3, start_str,
4, end_str,
5, info->title->str,
@@ -824,8 +824,8 @@
dbus_g_type_struct_set (&schedule,
0, data->schedule_id,
- 1, data->xx_program_id->str,
- 2, data->xx_channel_id,
+ 1, data->program_id->str,
+ 2, data->channel_id,
3, start_str_time,
4, end_str_time,
5, data->title->str,
@@ -1025,8 +1025,8 @@
/* record_id == -1 for generating a new id */
new_sched_info->schedule_id = -1;
- new_sched_info->xx_channel_id = channel_id;
- new_sched_info->xx_program_id = g_string_new (program_id);
+ new_sched_info->channel_id = channel_id;
+ new_sched_info->program_id = g_string_new (program_id);
new_sched_info->start_time = g_new0 (GTimeVal, 1);
*new_sched_info->start_time = *start_vtime;
new_sched_info->end_time = g_new0 (GTimeVal, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
