# HG changeset patch # User renatofilho # Date 1193323247 -3600 # Node ID 735d9b563b0272b7d9b7ad705279b4dc69f69c78 # Parent 48cf27f814b799baaa4c3b881a5aea608e4eccad [svn r876] renamed project diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/COPYING --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/COPYING Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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. + + + Copyright (C) + + 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 Street, Fifth Floor, Boston, MA 02110-1301 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. + + , 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. diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/INSTALL --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/INSTALL Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,236 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/Makefile.am Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,7 @@ +SUBDIRS = src data + +EXTRA_DIST = \ + ChangeLog + +DIST_SUBDIRS = \ + src data diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/autogen.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/autogen.sh Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,19 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +PKG_NAME="gmythdbus" + +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +} + +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 +} +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/configure.ac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/configure.ac Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,90 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.50) + +AC_INIT([myth-dbus],[0.1]) + +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADER(config.h) + +dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode +AM_MAINTAINER_MODE +dnl make aclocal work in maintainer mode +AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") + +AM_INIT_AUTOMAKE($PACKAGE, $VERSION) + +# Checks for programs. +# check for tools +# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g +CFLAGS="$CFLAGS -Wall" +AC_PROG_CC +AC_PROG_LIBTOOL + +# Checks for libraries. + +# Checks for header files. +AC_HEADER_STDC + +#Test if --disable-debug given +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--disable-debug], [enable debugging mode])) +if test x"$enable_debug" != xno; then + CFLAGS="$CFLAGS -g -DMYTH_STREAM_USE_DEBUG" +else + CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS" +fi + + +AS_AC_EXPAND(DATADIR, $datadir) + +DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" +AC_SUBST(DBUS_SERVICES_DIR) +AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) + + +# Checks required packages #################################################### +############################################################################### + +AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool, no) +if test "x$DBUSBINDINGTOOL" = "xno"; then + AC_MSG_ERROR([dbus-binding-tool not found in your PATH. Please correct this]) +fi +AC_SUBST(DBUS_BINDING_TOOL) + +AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) +if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) +fi + +PKG_CHECK_MODULES(DBUS, dbus-glib-1, HAVE_DBUS=yes, HAVE_DBUS=no) +if test "x$HAVE_DBUS" = "xno"; then + AC_MSG_ERROR(you need dbus-glib-1-dev installed) +fi +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) + +PKG_CHECK_MODULES(GMYTH, gmyth, HAVE_GMYTH=yes, HAVE_GMYTH=no) +if test "x$HAVE_GMYTH" = "xno"; then + AC_MSG_ERROR(you need libgmyth-dev installed) +fi +AC_SUBST(GMYTH_CFLAGS) +AC_SUBST(GMYTH_LIBS) + +AC_SUBST(CFLAGS) +AC_SUBST(LDFLAGS) +AC_SUBST(LIBS) + +AC_OUTPUT([ +Makefile +src/Makefile +data/Makefile +data/br.org.indt.GMyth.service +]) + +if test "x$enable_debug" != "xno"; then + AC_MSG_NOTICE([Debug: Enabled]) +else + AC_MSG_NOTICE([Debug: Disabled]) +fi diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/data/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/data/Makefile.am Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,3 @@ +# Dbus service file +servicedir = $(DBUS_SERVICES_DIR) +service_DATA = br.org.indt.GMyth.service diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/data/br.org.indt.GMyth.service.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/data/br.org.indt.GMyth.service.in Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=br.org.indt.GMyth +Exec=@prefix@/bin/gmythdbus diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/m4/as-expand.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/m4/as-expand.m4 Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,40 @@ +dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) +dnl +dnl example +dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) +dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local + +AC_DEFUN([AS_AC_EXPAND], +[ + EXP_VAR=[$1] + FROM_VAR=[$2] + + dnl first expand prefix and exec_prefix if necessary + prefix_save=$prefix + exec_prefix_save=$exec_prefix + + dnl if no prefix given, then use /usr/local, the default prefix + if test "x$prefix" = "xNONE"; then + prefix=$ac_default_prefix + fi + dnl if no exec_prefix given, then use prefix + if test "x$exec_prefix" = "xNONE"; then + exec_prefix=$prefix + fi + + full_var="$FROM_VAR" + dnl loop until it doesn't change anymore + while true; do + new_full_var="`eval echo $full_var`" + if test "x$new_full_var"="x$full_var"; then break; fi + full_var=$new_full_var + done + + dnl clean up + full_var=$new_full_var + AC_SUBST([$1], "$full_var") + + dnl restore prefix and exec_prefix + prefix=$prefix_save + exec_prefix=$exec_prefix_save +]) diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/src/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/src/Makefile.am Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,24 @@ +bin_PROGRAMS = \ + gmythdbus + +gmythdbus_SOURCES = \ + gmyth-dbus-server.h \ + gmyth-dbus-server.c \ + main.c + +gmythdbus_LDADD = \ + $(DBUS_LIBS) \ + $(GMYTH_LIBS) + +AM_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GMYTH_CFLAGS) + +BUILT_SOURCES = \ + gmyth-dbus-server-glue.h + +gmyth-dbus-server-glue.h: gmyth-dbus-server.xml + @DBUSBINDINGTOOL@ --mode=glib-server --prefix=gmyth_dbus_server --output=gmyth-dbus-server-glue.h gmyth-dbus-server.xml + +CLEANFILES = \ + $(BUILT_SOURCES) diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/src/gmyth-dbus-common.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/src/gmyth-dbus-common.h Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,57 @@ +#ifndef __GMYTH_DBUS_COMMON_H__ +#define __GMYTH_DBUS_COMMON_H__ + +#define GMYTH_DBUS_SERVER_NAME "br.org.indt.GMyth" +#define GMYTH_DBUS_SERVER_PATH "/br/org/indt/GMyth" +#define GMYTH_DBUS_SERVER_IFACE "br.org.indt.GMyth" + +#define GMYTH_DBUS_PROGRAM_G_TYPE \ + dbus_g_type_get_struct ("GValueArray", \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_INVALID); + +#define GMYTH_DBUS_CHANNEL_G_TYPE \ + dbus_g_type_get_struct ("GValueArray", \ + G_TYPE_INT, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_INVALID); + +#define GMYTH_DBUS_RECORD_G_TYPE \ + dbus_g_type_get_struct ("GValueArray", \ + G_TYPE_UINT, \ + G_TYPE_UINT, \ + G_TYPE_UINT, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_UINT64, \ + G_TYPE_INVALID); + +#define GMYTH_DBUS_SCHEDULE_G_TYPE \ + dbus_g_type_get_struct ("GValueArray", \ + G_TYPE_UINT, \ + G_TYPE_UINT, \ + G_TYPE_UINT, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_STRING, \ + G_TYPE_UINT, \ + G_TYPE_INVALID); + +#endif + diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/src/gmyth-dbus-server.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/src/gmyth-dbus-server.c Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,1029 @@ +/** + * GMyth Library + * + * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia. + * @author Renato Filho + * + * + * 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 +#include + + +#include "gmyth-dbus-common.h" +#include "gmyth-dbus-server.h" + +#define MYTH_DEFAULT_DB "mythconverg" + +typedef struct _GMythDbusServerPrivate GMythDbusServerPrivate; + +struct _GMythDbusServerPrivate +{ + GMythBackendInfo *myth_backend; + GMythEPG *myth_epg; + GMythScheduler *myth_scheduler; +}; + +#define GMYTH_DBUS_SERVER_GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerPrivate)) + +static void gmyth_dbus_server_class_init (GMythDbusServerClass *klass); +static void gmyth_dbus_server_init (GMythDbusServer *self); +static void gmyth_dbus_server_dispose (GObject *object); +static void gmyth_dbus_server_finalize (GObject *object); + +/* Dbus */ +static gboolean gmyth_dbus_server_connect (GObject *obj, + const gchar *host, + guint port, + const gchar *user, + const gchar *password, + gboolean *result, + GError **error); +static gboolean gmyth_dbus_server_get_channel_list (GObject *obj, + GPtrArray **channels, + GError **error); +static gboolean gmyth_dbus_server_get_channel_info (GObject *obj, + gint channel_id, + GValueArray **info, + GError **error); +static gboolean gmyth_dbus_server_file_exists (GObject *obj, + const gchar *file_name, + gboolean *exists, + GError **error); +static gboolean gmyth_dbus_server_get_recorded_list (GObject *obj, + GPtrArray **channels, + GError **error); +static gboolean gmyth_dbus_server_get_recorded_info (GObject *obj, + const gchar *basename, + GValueArray **info, + GError **error); +static gboolean gmyth_dbus_server_get_program_list (GObject *obj, + gint channel_id, + const gchar *start_time, + const gchar *end_time, + GPtrArray **program_list); +static gboolean gmyth_dbus_server_get_schedule_list (GObject *obj, + GPtrArray **schedule_list); + +static gboolean gmyth_dbus_server_connected (GObject *obj, + gboolean *status, + GError **error); +static gboolean gmyth_dbus_server_disconnect (GObject *obj, + GError **error); +static gboolean gmyth_dbus_server_get_server_info (GObject *obj, + guint64 *total_space, + guint64 *used_space, + guint64 *free_space, + GError **error); +static gboolean gmyth_dbus_server_get_thumbnail (GObject *obj, + const gchar *uri, + GByteArray **image, + GError **error); +static gboolean gmyth_dbus_server_get_channel_icon (GObject *obj, + guint channel_id, + GByteArray **icon, + GError **error); +static gboolean gmyth_dbus_server_stop_recording (GObject *obj, + guint channel_id, + gboolean *result, + GError **error); +static gboolean gmyth_dbus_server_add_schedule (GObject *obj, + guint channel_id, + guint program_id, + const gchar *start_time, + const gchar *end_time, + gboolean recurring, + const gchar *description, + guint *schedule_id, + GError **error); +static gboolean gmyth_dbus_server_add_exception (GObject *obj, + guint schedule_id, + guint channel_id, + guint program_id, + const gchar *start_time, + const gchar *end_time, + const gchar *description, + GError **error); +static gboolean gmyth_dbus_server_remove_schedule (GObject *obj, + guint schedule_id, + GError **error); + + +#include "gmyth-dbus-server-glue.h" + + +G_DEFINE_TYPE (GMythDbusServer, gmyth_dbus_server, G_TYPE_OBJECT); + +static void +gmyth_dbus_server_class_init (GMythDbusServerClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (GMythDbusServerPrivate)); + + object_class->dispose = gmyth_dbus_server_dispose; + object_class->finalize = gmyth_dbus_server_finalize; + + dbus_g_object_type_install_info (GMYTH_DBUS_SERVER_TYPE, + &dbus_glib_gmyth_dbus_server_object_info); +} + +static void +gmyth_dbus_server_init (GMythDbusServer *self) +{ +} + +static void +gmyth_dbus_server_dispose (GObject *object) +{ + G_OBJECT_CLASS (gmyth_dbus_server_parent_class)->dispose (object); +} + +static void +gmyth_dbus_server_finalize (GObject *object) +{ + G_OBJECT_CLASS (gmyth_dbus_server_parent_class)->finalize (object); +} + +static gboolean +gmyth_dbus_server_connect_epg (GMythDbusServer *server) +{ + GMythDbusServerPrivate *priv; + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server); + + if (!priv->myth_epg) + { + priv->myth_epg = gmyth_epg_new(); + if (!gmyth_epg_connect (priv->myth_epg, priv->myth_backend)) + { + g_object_unref (priv->myth_epg); + priv->myth_epg = NULL; + return FALSE; + } + } + + return TRUE; +} + +static gboolean +gmyth_dbus_server_connect_scheduler (GMythDbusServer *server) +{ + GMythDbusServerPrivate *priv; + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server); + + if (!priv->myth_scheduler) + { + priv->myth_scheduler = gmyth_scheduler_new (); + if (!gmyth_scheduler_connect (priv->myth_scheduler, + priv->myth_backend)) + { + g_object_unref (priv->myth_scheduler); + priv->myth_scheduler = NULL; + return FALSE; + } + } + + return TRUE; +} + +static gboolean +gmyth_dbus_server_connect (GObject *obj, + const gchar *host, + guint port, + const gchar *user, + const gchar *password, + gboolean *result, + GError **error) +{ + GMythDbusServerPrivate *priv; + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + if (priv->myth_backend) + return TRUE; + + priv->myth_backend = gmyth_backend_info_new_full (host, + user, + password, + MYTH_DEFAULT_DB, + port); + *result = TRUE; + return TRUE; +} + +static gboolean +gmyth_dbus_server_connected (GObject *obj, + gboolean *status, + GError **error) +{ + GMythDbusServerPrivate *priv; + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + if (priv->myth_backend) + *status = TRUE; + else + *status = FALSE; + return TRUE; +} + +static gboolean +gmyth_dbus_server_disconnect (GObject *obj, + GError **error) +{ + GMythDbusServerPrivate *priv; + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + if (priv->myth_epg) + { + g_object_unref (priv->myth_epg); + priv->myth_epg = NULL; + } + + + if (priv->myth_backend) + { + g_object_unref (priv->myth_backend); + priv->myth_backend = NULL; + } + + if (priv->myth_scheduler) + { + g_object_unref (priv->myth_scheduler); + priv->myth_scheduler = NULL; + } + + + return TRUE; +} + +static gboolean +gmyth_dbus_server_get_server_info (GObject *obj, + guint64 *total_space, + guint64 *used_space, + guint64 *free_space, + GError **error) +{ + GMythBackendDetails *details; + GMythDbusServerPrivate *priv; + gboolean ret = FALSE; + GMythSocket *socket; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend != NULL, FALSE); + + socket = gmyth_backend_info_get_connected_socket (priv->myth_backend); + + details = NULL; + gmyth_util_get_backend_details (socket, + &details); + if (details) + { + *total_space = details->total_space; + *used_space = details->used_space; + *free_space = *total_space - *used_space; + gmyth_util_backend_details_free (details); + + ret = TRUE; + } + + g_object_unref (socket); + + return ret; +} + + +static void +gmyth_dbus_server_parse_channel_info (GMythChannelInfo *info, + GValue *val) +{ + dbus_g_type_struct_set (val, + 0, info->channel_ID, + 1, info->channel_num->str, + 2, info->channel_name->str, + 3, info->channel_icon->str, + G_MAXUINT); +} + +static gboolean +gmyth_dbus_server_get_channel_info (GObject *obj, + gint channel_id, + GValueArray **info, + GError **error) +{ + GType ch_type; + GMythChannelInfo *ch_info; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend != NULL, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE); + + ch_type = GMYTH_DBUS_CHANNEL_G_TYPE; + + ch_info = gmyth_epg_get_channel_info (priv->myth_epg, channel_id); + if (ch_info) + { + GValue v = { 0, }; + g_value_init (&v, ch_type); + g_value_take_boxed (&v, dbus_g_type_specialized_construct (ch_type)); + gmyth_dbus_server_parse_channel_info (ch_info, &v); + + *info = g_value_get_boxed (&v); + return TRUE; + } + + return FALSE; +} + + +static gboolean +gmyth_dbus_server_get_channel_list (GObject *obj, + GPtrArray **channels, + GError **error) +{ + GList *lst; + GList *walk; + int len; + GType ch_type; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend != NULL, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE); + + + len = gmyth_epg_get_channel_list (priv->myth_epg, &lst); + + *channels = g_ptr_array_sized_new (len); + ch_type = GMYTH_DBUS_CHANNEL_G_TYPE; + + for (walk = lst; walk != NULL; walk = walk->next) + { + GValue ch = { 0, }; + GMythChannelInfo *data; + + data = (GMythChannelInfo *) walk->data; + + g_value_init (&ch, ch_type); + g_value_take_boxed (&ch, dbus_g_type_specialized_construct (ch_type)); + gmyth_dbus_server_parse_channel_info (data, &ch); + g_ptr_array_add (*channels, g_value_get_boxed (&ch)); + } + + gmyth_free_channel_list (lst); + return TRUE; +} + +static gboolean +gmyth_dbus_server_file_exists (GObject *obj, + const gchar *file_name, + gboolean *exists, + GError **error) +{ + GMythDbusServerPrivate *priv; + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + + *exists = gmyth_util_file_exists (priv->myth_backend, file_name); + + return TRUE; +} + +static gboolean +gmyth_dbus_server_get_program_list (GObject *obj, + gint channel_id, + const gchar *start_time, + const gchar *end_time, + GPtrArray **programs) +{ + GList *list; + GList *walk; + gint len; + GType program_type; + GTimeVal start_time_val; + GTimeVal end_time_val; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE); + + g_time_val_from_iso8601 (start_time, &start_time_val); + g_time_val_from_iso8601 (end_time, &end_time_val); + + list = NULL; + len = gmyth_epg_get_program_list (priv->myth_epg, + &list, + channel_id, + &start_time_val, + &end_time_val); + + *programs = g_ptr_array_sized_new (len); + program_type = GMYTH_DBUS_PROGRAM_G_TYPE; + + for (walk = list; walk != NULL; walk = walk->next) + { + GValue program = { 0, }; + gchar *start_str; + gchar *end_str; + GMythProgramInfo *data; + + data = (GMythProgramInfo *) walk->data; + + if (!data) + continue; + + g_value_init (&program, program_type); + g_value_take_boxed (&program, + dbus_g_type_specialized_construct (program_type)); + + start_str = g_time_val_to_iso8601 (data->startts); + end_str = g_time_val_to_iso8601 (data->endts); + + dbus_g_type_struct_set (&program, + 0, data->chanid->str, + 1, start_str, + 2, end_str, + 3, data->title->str, + 4, data->subtitle->str, + 5, data->description->str, + 6, data->category->str, + G_MAXUINT); + + g_ptr_array_add (*programs, g_value_get_boxed (&program)); + g_free (start_str); + g_free (end_str); + } + + if (list) + gmyth_free_program_list (list); + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + return TRUE; +} + +static void +gmyth_dbus_server_parse_recorded_info (RecordedInfo *info, + GValue *val) +{ + gchar *start_str; + gchar *end_str; + + start_str = g_time_val_to_iso8601 (info->start_time); + end_str = g_time_val_to_iso8601 (info->end_time); + + dbus_g_type_struct_set (val, + 0, info->record_id, + 1, info->program_id, + 2, info->channel_id, + 3, start_str, + 4, end_str, + 5, info->title->str, + 6, info->subtitle->str, + 7, info->description->str, + 8, info->category->str, + 9, info->basename->str, + 10, info->filesize, + G_MAXUINT); + g_free (start_str); + g_free (end_str); +} + +static gboolean +gmyth_dbus_server_get_recorded_info (GObject *obj, + const gchar *basename, + GValueArray **info, + GError **error) +{ + GType record_type; + GMythDbusServerPrivate *priv; + RecordedInfo *record_info; + + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + record_type = GMYTH_DBUS_RECORD_G_TYPE; + + record_info = gmyth_scheduler_get_recorded_info (priv->myth_scheduler, + basename); + + if (record_info) + { + GValue r = { 0, }; + + g_value_init (&r, record_type); + g_value_take_boxed (&r, + dbus_g_type_specialized_construct (record_type)); + + gmyth_dbus_server_parse_recorded_info (record_info, &r); + gmyth_recorded_info_free (record_info); + + *info = g_value_get_boxed (&r); + + return TRUE; + } + + return FALSE; +} + + +static gboolean +gmyth_dbus_server_get_recorded_list (GObject *obj, + GPtrArray **records, + GError **error) +{ + GList *list; + GList *walk; + gint len; + GType record_type; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + + len = gmyth_scheduler_get_recorded_list (priv->myth_scheduler, + &list); + + record_type = GMYTH_DBUS_RECORD_G_TYPE; + *records = g_ptr_array_sized_new (len); + + for (walk = list; walk != NULL; walk = walk->next) + { + GValue record = { 0, }; + RecordedInfo *data; + + data = (RecordedInfo *) walk->data; + + g_value_init (&record, record_type); + g_value_take_boxed (&record, + dbus_g_type_specialized_construct (record_type)); + + gmyth_dbus_server_parse_recorded_info (data, &record); + + g_ptr_array_add (*records, g_value_get_boxed (&record)); + //g_value_unset (&record); + } + + gmyth_recorded_info_list_free (list); + + return TRUE; + +} + +static gboolean +gmyth_dbus_server_get_schedule_list (GObject *obj, + GPtrArray **schedules) +{ + GList *list; + GList *walk; + gint len; + GType schedule_type; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + + len = gmyth_scheduler_get_schedule_list (priv->myth_scheduler, + &list); + + *schedules = g_ptr_array_sized_new (len); + schedule_type = GMYTH_DBUS_SCHEDULE_G_TYPE; + + for (walk = list; walk != NULL; walk = walk->next) + { + GValue schedule = { 0, }; + ScheduleInfo *data; + gchar *start_str_time; + gchar *end_str_time; + + data = (ScheduleInfo *) walk->data; + + g_value_init (&schedule, schedule_type); + g_value_take_boxed (&schedule, + dbus_g_type_specialized_construct (schedule_type)); + + start_str_time = g_time_val_to_iso8601 (data->start_time); + end_str_time = g_time_val_to_iso8601 (data->end_time); + + dbus_g_type_struct_set (&schedule, + 0, data->schedule_id, + 1, data->program_id, + 2, data->channel_id, + 3, start_str_time, + 4, end_str_time, + 5, data->title->str, + 6, data->subtitle->str, + 7, data->description->str, + 8, data->category->str, + 9, data->type, + G_MAXUINT); + + g_ptr_array_add (*schedules, g_value_get_boxed (&schedule)); + + g_free (start_str_time); + g_free (end_str_time); + } + + gmyth_schedule_info_list_free (list); + + return TRUE; +} + + +static gboolean +gmyth_dbus_server_get_thumbnail (GObject *obj, + const gchar *uri, + GByteArray **image, + GError **error) +{ + GMythFileTransfer *file_transfer; + glong filesize; + GMythFileReadResult result; + GMythDbusServerPrivate *priv; + + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + + if (!gmyth_util_file_exists (priv->myth_backend, uri)) + goto fail; + + file_transfer = gmyth_file_transfer_new (priv->myth_backend); + + if (!gmyth_file_transfer_open (file_transfer, uri)) + goto fail; + + filesize = gmyth_file_transfer_get_filesize (file_transfer); + if (filesize <= 0) + goto fail; + + *image = g_byte_array_new (); + result = gmyth_file_transfer_read (file_transfer, *image, filesize, FALSE); + if (result == GMYTH_FILE_READ_ERROR) + goto fail; + + gmyth_file_transfer_close (file_transfer); + g_object_unref (file_transfer); + + if (filesize > (*image)->len) + goto fail; + + return TRUE; + +fail: + if (*image) + g_byte_array_free (*image, TRUE); + g_object_unref(file_transfer); + return FALSE; +} + +static gboolean +gmyth_dbus_server_get_channel_icon (GObject *obj, + guint channel_id, + GByteArray **icon, + GError **error) +{ + GMythChannelInfo *channel = NULL; + guint8 *icon_data; + guint icon_length; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + g_return_val_if_fail (priv->myth_backend, FALSE); + + channel = gmyth_epg_get_channel_info (priv->myth_epg, + (gint) channel_id); + + *icon = NULL; + + if (channel == NULL) + return FALSE; + + if (!gmyth_epg_channel_has_icon(priv->myth_epg, channel)) + { + gmyth_channel_info_free (channel); + g_debug("Channel does not have icon available"); + return FALSE; + } + + icon_data = NULL; + icon_length = 0; + if (!gmyth_epg_channel_get_icon (priv->myth_epg, + channel, + &icon_data, + &icon_length)) + { + gmyth_channel_info_free (channel); + g_warning("Could not get channel icon for channel id = %u", channel_id); + return FALSE; + } + + *icon = g_byte_array_sized_new (icon_length); + *icon = g_byte_array_append (*icon, icon_data, icon_length); + + g_free (icon_data); + gmyth_channel_info_free(channel); + return TRUE; +} + + +static gboolean +gmyth_dbus_server_stop_recording (GObject *obj, + guint channel_id, + gboolean *result, + GError **error) +{ + gboolean ret = FALSE; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + ret = gmyth_scheduler_stop_recording (priv->myth_scheduler, + channel_id); + + return ret; +} + +static ScheduleInfo* +gmyth_dbus_server_new_schedule_info (const gchar* description, + guint channel_id, + guint program_id, + GTimeVal *start_vtime, + GTimeVal *end_vtime) +{ + ScheduleInfo *new_sched_info; + + new_sched_info = g_new0(ScheduleInfo, 1); + + /* record_id == -1 for generating a new id */ + new_sched_info->schedule_id = -1; + + new_sched_info->channel_id = channel_id; + new_sched_info->program_id = 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); + *new_sched_info->end_time = *end_vtime; + + /* TODO: there is no frequency field */ + /*new_sched_info->frequency = -1;*/ + + if (description != NULL) { + /* FIXME: description parameter is used as title and description */ + new_sched_info->title = g_string_new(description); + new_sched_info->description = g_string_new(description); + } + + return new_sched_info; +} + +static gboolean +gmyth_dbus_server_add_schedule (GObject *obj, + guint channel_id, + guint program_id, + const gchar *start_time, + const gchar *end_time, + gboolean recurring, + const gchar *description, + guint *schedule_id, + GError **error) +{ + ScheduleInfo *sch_info; + GTimeVal start_vtime; + GTimeVal end_vtime; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + *schedule_id = 0; + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + + g_time_val_from_iso8601 (start_time, &start_vtime); + g_time_val_from_iso8601 (end_time, &end_vtime); + sch_info = gmyth_dbus_server_new_schedule_info (description, + channel_id, + program_id, + &start_vtime, + &end_vtime); + if (sch_info != NULL) { + GMythScheduleType type; + GTimeVal t_now; + gboolean has_record; + + type = (recurring ? + GMYTH_SCHEDULE_ALL_OCCURRENCES : + GMYTH_SCHEDULE_ONE_OCCURRENCE); + + g_get_current_time (&t_now); + + has_record = gmyth_scheduler_was_recorded_before (priv->myth_scheduler, + channel_id, + (time_t) start_vtime.tv_sec); + + + if ((t_now.tv_sec >= start_vtime.tv_sec) + && (t_now.tv_sec <= end_vtime.tv_sec) && has_record) + { + GMythSocket *socket; + gboolean res = FALSE; + + socket = gmyth_backend_info_get_connected_socket (priv->myth_backend); + res = gmyth_scheduler_reactivate_schedule(priv->myth_scheduler, + channel_id, + (time_t) start_vtime.tv_sec); + if (res) { + GMythStringList *slist = gmyth_string_list_new(); + + 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_object_unref(socket); + return res; + } + else + { + if (!gmyth_scheduler_add_schedule_full (priv->myth_scheduler, + sch_info, + type)) + { + g_warning("Could not add schedule entry"); + return FALSE; + } + + (*schedule_id) = sch_info->schedule_id; + gmyth_schedule_info_free (sch_info); + return TRUE; + } + } + return FALSE; +} + +static gboolean +gmyth_dbus_server_add_exception (GObject *obj, + guint schedule_id, + guint channel_id, + guint program_id, + const gchar *start_time, + const gchar *end_time, + const gchar *description, + GError **error) +{ + ScheduleInfo *sch_info; + GTimeVal start_vtime; + GTimeVal end_vtime; + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + g_time_val_from_iso8601 (start_time, &start_vtime); + g_time_val_from_iso8601 (end_time, &end_vtime); + + sch_info = gmyth_dbus_server_new_schedule_info (description, + channel_id, + program_id, + &start_vtime, + &end_vtime); + if (sch_info != NULL) + { + if (!gmyth_scheduler_add_exception (priv->myth_scheduler, + schedule_id, + sch_info)) + { + g_warning ("Could not add schedule exception"); + gmyth_schedule_info_free (sch_info); + return FALSE; + } + + gmyth_schedule_info_free (sch_info); + return TRUE; + } + return FALSE; +} + +static gboolean +gmyth_dbus_server_remove_schedule (GObject *obj, + guint schedule_id, + GError **error) +{ + GMythDbusServerPrivate *priv; + + g_debug ("%s:%d", __FUNCTION__, __LINE__); + priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); + + g_return_val_if_fail (priv->myth_backend, FALSE); + g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); + + return gmyth_scheduler_delete_schedule (priv->myth_scheduler, schedule_id); +} + +GMythDbusServer* +gmyth_dbus_server_start_dbus_service (void) +{ + GError *error = NULL; + DBusGProxy *proxy; + DBusGConnection *bus; + guint request_ret; + GMythDbusServer *self; + + self = g_object_new (GMYTH_DBUS_SERVER_TYPE, NULL); + g_return_val_if_fail (self, FALSE); + + /* TODO: should verify if this service was already started */ + + /* connect to session bus */ + bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + if (bus == NULL) + { + g_warning ("Could not connect to dbus: %s", error->message); + g_error_free (error); + goto fail; + } + + /* register dbus object */ + dbus_g_connection_register_g_object (bus, + GMYTH_DBUS_SERVER_PATH, G_OBJECT (self)); + + proxy = dbus_g_proxy_new_for_name (bus, DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + + /* registering download manager service */ + if (!org_freedesktop_DBus_request_name (proxy, GMYTH_DBUS_SERVER_IFACE, + 0, &request_ret, &error)) + { + g_warning ("Unable to register dbus service: %d %s", + error->code, error->message); + g_error_free (error); + goto fail; + } + + if (request_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) + { + g_warning ("Got result code %u from requesting name", request_ret); + goto fail; + } + + return self; + +fail: + g_object_unref (self); + return NULL; +} + diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/src/gmyth-dbus-server.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/src/gmyth-dbus-server.h Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,64 @@ +/** + * GMyth Library + * + * @file gmyth/gmyth_backend_info.c + * + * @brief

This component represents all the MythTV backend server + * configuration information. + * + * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia. + * @author Renato Filho + * + * + * 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_DBUS_SERVER_H__ +#define __GMYTH_DBUS_SERVER_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GMYTH_DBUS_SERVER_TYPE (gmyth_dbus_server_get_type ()) +#define GMYTH_DBUS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_DBUS_SERVER_TYPE, GMythDbusServer)) +#define GMYTH_DBUS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerClass)) +#define IS_GMYTH_DBUS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GMYTH_DBUS_SERVER_TYPE)) +#define IS_GMYTH_DBUS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GMYTH_DBUS_SERVER_TYPE)) +#define GMYTH_DBUS_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerClass)) + + +typedef struct _GMythDbusServer GMythDbusServer; +typedef struct _GMythDbusServerClass GMythDbusServerClass; + +struct _GMythDbusServerClass +{ + GObjectClass parent_class; +}; + +struct _GMythDbusServer +{ + GObject parent; +}; + +GType gmyth_dbus_server_get_type (void); +GMythDbusServer * gmyth_dbus_server_start_dbus_service (void); + + +G_END_DECLS + +#endif diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/src/gmyth-dbus-server.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/src/gmyth-dbus-server.xml Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/src/main.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/src/main.c Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,19 @@ +#include "gmyth-dbus-server.h" + +int main (int argc, char* argv[]) +{ + GMainLoop *loop; + GMythDbusServer *srv; + + g_type_init (); + g_thread_init (NULL); + + + loop = g_main_loop_new (NULL, FALSE); + srv = gmyth_dbus_server_start_dbus_service (); + + if (srv) + g_main_loop_run (loop); + + return 0; +} diff -r 48cf27f814b7 -r 735d9b563b02 gmyth-dbus/tests/channel-list.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gmyth-dbus/tests/channel-list.py Thu Oct 25 15:40:47 2007 +0100 @@ -0,0 +1,12 @@ +import dbus +bus = dbus.SessionBus() + +proxy = bus.get_object ('br.org.indt.GMyth', '/br/org/indt/GMyth') +iface = dbus.Interface (proxy, dbus_interface='br.org.indt.GMyth') +iface.Connect ('192.168.2.222', 6543, 'mythtv', 'mythtv') +print iface.Connected () +print iface.GetChannelList () +print "--------------------------------------------------------" +print iface.GetRecordedList () +#print iface.FileExists ("teste.nuv") +#print iface.GetProgramList (1003, ') diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/COPYING --- a/myth-dbus/COPYING Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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. - - - Copyright (C) - - 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 Street, Fifth Floor, Boston, MA 02110-1301 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. - - , 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. diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/INSTALL --- a/myth-dbus/INSTALL Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/Makefile.am --- a/myth-dbus/Makefile.am Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -SUBDIRS = src data - -EXTRA_DIST = \ - ChangeLog - -DIST_SUBDIRS = \ - src data diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/autogen.sh --- a/myth-dbus/autogen.sh Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="gmythdbus" - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/configure.ac --- a/myth-dbus/configure.ac Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.50) - -AC_INIT([myth-dbus],[0.1]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADER(config.h) - -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode -AM_MAINTAINER_MODE -dnl make aclocal work in maintainer mode -AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") - -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) - -# Checks for programs. -# check for tools -# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g -CFLAGS="$CFLAGS -Wall" -AC_PROG_CC -AC_PROG_LIBTOOL - -# Checks for libraries. - -# Checks for header files. -AC_HEADER_STDC - -#Test if --disable-debug given -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--disable-debug], [enable debugging mode])) -if test x"$enable_debug" != xno; then - CFLAGS="$CFLAGS -g -DMYTH_STREAM_USE_DEBUG" -else - CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS" -fi - - -AS_AC_EXPAND(DATADIR, $datadir) - -DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" -AC_SUBST(DBUS_SERVICES_DIR) -AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) - - -# Checks required packages #################################################### -############################################################################### - -AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool, no) -if test "x$DBUSBINDINGTOOL" = "xno"; then - AC_MSG_ERROR([dbus-binding-tool not found in your PATH. Please correct this]) -fi -AC_SUBST(DBUS_BINDING_TOOL) - -AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) -if test "x$HAVE_PKGCONFIG" = "xno"; then - AC_MSG_ERROR(you need to have pkgconfig installed !) -fi - -PKG_CHECK_MODULES(DBUS, dbus-glib-1, HAVE_DBUS=yes, HAVE_DBUS=no) -if test "x$HAVE_DBUS" = "xno"; then - AC_MSG_ERROR(you need dbus-glib-1-dev installed) -fi -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - -PKG_CHECK_MODULES(GMYTH, gmyth, HAVE_GMYTH=yes, HAVE_GMYTH=no) -if test "x$HAVE_GMYTH" = "xno"; then - AC_MSG_ERROR(you need libgmyth-dev installed) -fi -AC_SUBST(GMYTH_CFLAGS) -AC_SUBST(GMYTH_LIBS) - -AC_SUBST(CFLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(LIBS) - -AC_OUTPUT([ -Makefile -src/Makefile -data/Makefile -data/br.org.indt.GMyth.service -]) - -if test "x$enable_debug" != "xno"; then - AC_MSG_NOTICE([Debug: Enabled]) -else - AC_MSG_NOTICE([Debug: Disabled]) -fi diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/data/Makefile.am --- a/myth-dbus/data/Makefile.am Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -# Dbus service file -servicedir = $(DBUS_SERVICES_DIR) -service_DATA = br.org.indt.GMyth.service diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/data/br.org.indt.GMyth.service.in --- a/myth-dbus/data/br.org.indt.GMyth.service.in Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=br.org.indt.GMyth -Exec=@prefix@/bin/gmythdbus diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/m4/as-expand.m4 --- a/myth-dbus/m4/as-expand.m4 Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -dnl -dnl example -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var"="x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/src/Makefile.am --- a/myth-dbus/src/Makefile.am Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -bin_PROGRAMS = \ - gmythdbus - -gmythdbus_SOURCES = \ - gmyth-dbus-server.h \ - gmyth-dbus-server.c \ - main.c - -gmythdbus_LDADD = \ - $(DBUS_LIBS) \ - $(GMYTH_LIBS) - -AM_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GMYTH_CFLAGS) - -BUILT_SOURCES = \ - gmyth-dbus-server-glue.h - -gmyth-dbus-server-glue.h: gmyth-dbus-server.xml - @DBUSBINDINGTOOL@ --mode=glib-server --prefix=gmyth_dbus_server --output=gmyth-dbus-server-glue.h gmyth-dbus-server.xml - -CLEANFILES = \ - $(BUILT_SOURCES) diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/src/gmyth-dbus-common.h --- a/myth-dbus/src/gmyth-dbus-common.h Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -#ifndef __GMYTH_DBUS_COMMON_H__ -#define __GMYTH_DBUS_COMMON_H__ - -#define GMYTH_DBUS_SERVER_NAME "br.org.indt.GMyth" -#define GMYTH_DBUS_SERVER_PATH "/br/org/indt/GMyth" -#define GMYTH_DBUS_SERVER_IFACE "br.org.indt.GMyth" - -#define GMYTH_DBUS_PROGRAM_G_TYPE \ - dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_INVALID); - -#define GMYTH_DBUS_CHANNEL_G_TYPE \ - dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_INT, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_INVALID); - -#define GMYTH_DBUS_RECORD_G_TYPE \ - dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_UINT, \ - G_TYPE_UINT, \ - G_TYPE_UINT, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_UINT64, \ - G_TYPE_INVALID); - -#define GMYTH_DBUS_SCHEDULE_G_TYPE \ - dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_UINT, \ - G_TYPE_UINT, \ - G_TYPE_UINT, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_STRING, \ - G_TYPE_UINT, \ - G_TYPE_INVALID); - -#endif - diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/src/gmyth-dbus-server.c --- a/myth-dbus/src/gmyth-dbus-server.c Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1029 +0,0 @@ -/** - * GMyth Library - * - * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia. - * @author Renato Filho - * - * - * 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 -#include - - -#include "gmyth-dbus-common.h" -#include "gmyth-dbus-server.h" - -#define MYTH_DEFAULT_DB "mythconverg" - -typedef struct _GMythDbusServerPrivate GMythDbusServerPrivate; - -struct _GMythDbusServerPrivate -{ - GMythBackendInfo *myth_backend; - GMythEPG *myth_epg; - GMythScheduler *myth_scheduler; -}; - -#define GMYTH_DBUS_SERVER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerPrivate)) - -static void gmyth_dbus_server_class_init (GMythDbusServerClass *klass); -static void gmyth_dbus_server_init (GMythDbusServer *self); -static void gmyth_dbus_server_dispose (GObject *object); -static void gmyth_dbus_server_finalize (GObject *object); - -/* Dbus */ -static gboolean gmyth_dbus_server_connect (GObject *obj, - const gchar *host, - guint port, - const gchar *user, - const gchar *password, - gboolean *result, - GError **error); -static gboolean gmyth_dbus_server_get_channel_list (GObject *obj, - GPtrArray **channels, - GError **error); -static gboolean gmyth_dbus_server_get_channel_info (GObject *obj, - gint channel_id, - GValueArray **info, - GError **error); -static gboolean gmyth_dbus_server_file_exists (GObject *obj, - const gchar *file_name, - gboolean *exists, - GError **error); -static gboolean gmyth_dbus_server_get_recorded_list (GObject *obj, - GPtrArray **channels, - GError **error); -static gboolean gmyth_dbus_server_get_recorded_info (GObject *obj, - const gchar *basename, - GValueArray **info, - GError **error); -static gboolean gmyth_dbus_server_get_program_list (GObject *obj, - gint channel_id, - const gchar *start_time, - const gchar *end_time, - GPtrArray **program_list); -static gboolean gmyth_dbus_server_get_schedule_list (GObject *obj, - GPtrArray **schedule_list); - -static gboolean gmyth_dbus_server_connected (GObject *obj, - gboolean *status, - GError **error); -static gboolean gmyth_dbus_server_disconnect (GObject *obj, - GError **error); -static gboolean gmyth_dbus_server_get_server_info (GObject *obj, - guint64 *total_space, - guint64 *used_space, - guint64 *free_space, - GError **error); -static gboolean gmyth_dbus_server_get_thumbnail (GObject *obj, - const gchar *uri, - GByteArray **image, - GError **error); -static gboolean gmyth_dbus_server_get_channel_icon (GObject *obj, - guint channel_id, - GByteArray **icon, - GError **error); -static gboolean gmyth_dbus_server_stop_recording (GObject *obj, - guint channel_id, - gboolean *result, - GError **error); -static gboolean gmyth_dbus_server_add_schedule (GObject *obj, - guint channel_id, - guint program_id, - const gchar *start_time, - const gchar *end_time, - gboolean recurring, - const gchar *description, - guint *schedule_id, - GError **error); -static gboolean gmyth_dbus_server_add_exception (GObject *obj, - guint schedule_id, - guint channel_id, - guint program_id, - const gchar *start_time, - const gchar *end_time, - const gchar *description, - GError **error); -static gboolean gmyth_dbus_server_remove_schedule (GObject *obj, - guint schedule_id, - GError **error); - - -#include "gmyth-dbus-server-glue.h" - - -G_DEFINE_TYPE (GMythDbusServer, gmyth_dbus_server, G_TYPE_OBJECT); - -static void -gmyth_dbus_server_class_init (GMythDbusServerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (GMythDbusServerPrivate)); - - object_class->dispose = gmyth_dbus_server_dispose; - object_class->finalize = gmyth_dbus_server_finalize; - - dbus_g_object_type_install_info (GMYTH_DBUS_SERVER_TYPE, - &dbus_glib_gmyth_dbus_server_object_info); -} - -static void -gmyth_dbus_server_init (GMythDbusServer *self) -{ -} - -static void -gmyth_dbus_server_dispose (GObject *object) -{ - G_OBJECT_CLASS (gmyth_dbus_server_parent_class)->dispose (object); -} - -static void -gmyth_dbus_server_finalize (GObject *object) -{ - G_OBJECT_CLASS (gmyth_dbus_server_parent_class)->finalize (object); -} - -static gboolean -gmyth_dbus_server_connect_epg (GMythDbusServer *server) -{ - GMythDbusServerPrivate *priv; - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server); - - if (!priv->myth_epg) - { - priv->myth_epg = gmyth_epg_new(); - if (!gmyth_epg_connect (priv->myth_epg, priv->myth_backend)) - { - g_object_unref (priv->myth_epg); - priv->myth_epg = NULL; - return FALSE; - } - } - - return TRUE; -} - -static gboolean -gmyth_dbus_server_connect_scheduler (GMythDbusServer *server) -{ - GMythDbusServerPrivate *priv; - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server); - - if (!priv->myth_scheduler) - { - priv->myth_scheduler = gmyth_scheduler_new (); - if (!gmyth_scheduler_connect (priv->myth_scheduler, - priv->myth_backend)) - { - g_object_unref (priv->myth_scheduler); - priv->myth_scheduler = NULL; - return FALSE; - } - } - - return TRUE; -} - -static gboolean -gmyth_dbus_server_connect (GObject *obj, - const gchar *host, - guint port, - const gchar *user, - const gchar *password, - gboolean *result, - GError **error) -{ - GMythDbusServerPrivate *priv; - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - if (priv->myth_backend) - return TRUE; - - priv->myth_backend = gmyth_backend_info_new_full (host, - user, - password, - MYTH_DEFAULT_DB, - port); - *result = TRUE; - return TRUE; -} - -static gboolean -gmyth_dbus_server_connected (GObject *obj, - gboolean *status, - GError **error) -{ - GMythDbusServerPrivate *priv; - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - if (priv->myth_backend) - *status = TRUE; - else - *status = FALSE; - return TRUE; -} - -static gboolean -gmyth_dbus_server_disconnect (GObject *obj, - GError **error) -{ - GMythDbusServerPrivate *priv; - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - if (priv->myth_epg) - { - g_object_unref (priv->myth_epg); - priv->myth_epg = NULL; - } - - - if (priv->myth_backend) - { - g_object_unref (priv->myth_backend); - priv->myth_backend = NULL; - } - - if (priv->myth_scheduler) - { - g_object_unref (priv->myth_scheduler); - priv->myth_scheduler = NULL; - } - - - return TRUE; -} - -static gboolean -gmyth_dbus_server_get_server_info (GObject *obj, - guint64 *total_space, - guint64 *used_space, - guint64 *free_space, - GError **error) -{ - GMythBackendDetails *details; - GMythDbusServerPrivate *priv; - gboolean ret = FALSE; - GMythSocket *socket; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend != NULL, FALSE); - - socket = gmyth_backend_info_get_connected_socket (priv->myth_backend); - - details = NULL; - gmyth_util_get_backend_details (socket, - &details); - if (details) - { - *total_space = details->total_space; - *used_space = details->used_space; - *free_space = *total_space - *used_space; - gmyth_util_backend_details_free (details); - - ret = TRUE; - } - - g_object_unref (socket); - - return ret; -} - - -static void -gmyth_dbus_server_parse_channel_info (GMythChannelInfo *info, - GValue *val) -{ - dbus_g_type_struct_set (val, - 0, info->channel_ID, - 1, info->channel_num->str, - 2, info->channel_name->str, - 3, info->channel_icon->str, - G_MAXUINT); -} - -static gboolean -gmyth_dbus_server_get_channel_info (GObject *obj, - gint channel_id, - GValueArray **info, - GError **error) -{ - GType ch_type; - GMythChannelInfo *ch_info; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend != NULL, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE); - - ch_type = GMYTH_DBUS_CHANNEL_G_TYPE; - - ch_info = gmyth_epg_get_channel_info (priv->myth_epg, channel_id); - if (ch_info) - { - GValue v = { 0, }; - g_value_init (&v, ch_type); - g_value_take_boxed (&v, dbus_g_type_specialized_construct (ch_type)); - gmyth_dbus_server_parse_channel_info (ch_info, &v); - - *info = g_value_get_boxed (&v); - return TRUE; - } - - return FALSE; -} - - -static gboolean -gmyth_dbus_server_get_channel_list (GObject *obj, - GPtrArray **channels, - GError **error) -{ - GList *lst; - GList *walk; - int len; - GType ch_type; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend != NULL, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE); - - - len = gmyth_epg_get_channel_list (priv->myth_epg, &lst); - - *channels = g_ptr_array_sized_new (len); - ch_type = GMYTH_DBUS_CHANNEL_G_TYPE; - - for (walk = lst; walk != NULL; walk = walk->next) - { - GValue ch = { 0, }; - GMythChannelInfo *data; - - data = (GMythChannelInfo *) walk->data; - - g_value_init (&ch, ch_type); - g_value_take_boxed (&ch, dbus_g_type_specialized_construct (ch_type)); - gmyth_dbus_server_parse_channel_info (data, &ch); - g_ptr_array_add (*channels, g_value_get_boxed (&ch)); - } - - gmyth_free_channel_list (lst); - return TRUE; -} - -static gboolean -gmyth_dbus_server_file_exists (GObject *obj, - const gchar *file_name, - gboolean *exists, - GError **error) -{ - GMythDbusServerPrivate *priv; - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - - *exists = gmyth_util_file_exists (priv->myth_backend, file_name); - - return TRUE; -} - -static gboolean -gmyth_dbus_server_get_program_list (GObject *obj, - gint channel_id, - const gchar *start_time, - const gchar *end_time, - GPtrArray **programs) -{ - GList *list; - GList *walk; - gint len; - GType program_type; - GTimeVal start_time_val; - GTimeVal end_time_val; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE); - - g_time_val_from_iso8601 (start_time, &start_time_val); - g_time_val_from_iso8601 (end_time, &end_time_val); - - list = NULL; - len = gmyth_epg_get_program_list (priv->myth_epg, - &list, - channel_id, - &start_time_val, - &end_time_val); - - *programs = g_ptr_array_sized_new (len); - program_type = GMYTH_DBUS_PROGRAM_G_TYPE; - - for (walk = list; walk != NULL; walk = walk->next) - { - GValue program = { 0, }; - gchar *start_str; - gchar *end_str; - GMythProgramInfo *data; - - data = (GMythProgramInfo *) walk->data; - - if (!data) - continue; - - g_value_init (&program, program_type); - g_value_take_boxed (&program, - dbus_g_type_specialized_construct (program_type)); - - start_str = g_time_val_to_iso8601 (data->startts); - end_str = g_time_val_to_iso8601 (data->endts); - - dbus_g_type_struct_set (&program, - 0, data->chanid->str, - 1, start_str, - 2, end_str, - 3, data->title->str, - 4, data->subtitle->str, - 5, data->description->str, - 6, data->category->str, - G_MAXUINT); - - g_ptr_array_add (*programs, g_value_get_boxed (&program)); - g_free (start_str); - g_free (end_str); - } - - if (list) - gmyth_free_program_list (list); - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - return TRUE; -} - -static void -gmyth_dbus_server_parse_recorded_info (RecordedInfo *info, - GValue *val) -{ - gchar *start_str; - gchar *end_str; - - start_str = g_time_val_to_iso8601 (info->start_time); - end_str = g_time_val_to_iso8601 (info->end_time); - - dbus_g_type_struct_set (val, - 0, info->record_id, - 1, info->program_id, - 2, info->channel_id, - 3, start_str, - 4, end_str, - 5, info->title->str, - 6, info->subtitle->str, - 7, info->description->str, - 8, info->category->str, - 9, info->basename->str, - 10, info->filesize, - G_MAXUINT); - g_free (start_str); - g_free (end_str); -} - -static gboolean -gmyth_dbus_server_get_recorded_info (GObject *obj, - const gchar *basename, - GValueArray **info, - GError **error) -{ - GType record_type; - GMythDbusServerPrivate *priv; - RecordedInfo *record_info; - - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - record_type = GMYTH_DBUS_RECORD_G_TYPE; - - record_info = gmyth_scheduler_get_recorded_info (priv->myth_scheduler, - basename); - - if (record_info) - { - GValue r = { 0, }; - - g_value_init (&r, record_type); - g_value_take_boxed (&r, - dbus_g_type_specialized_construct (record_type)); - - gmyth_dbus_server_parse_recorded_info (record_info, &r); - gmyth_recorded_info_free (record_info); - - *info = g_value_get_boxed (&r); - - return TRUE; - } - - return FALSE; -} - - -static gboolean -gmyth_dbus_server_get_recorded_list (GObject *obj, - GPtrArray **records, - GError **error) -{ - GList *list; - GList *walk; - gint len; - GType record_type; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - - len = gmyth_scheduler_get_recorded_list (priv->myth_scheduler, - &list); - - record_type = GMYTH_DBUS_RECORD_G_TYPE; - *records = g_ptr_array_sized_new (len); - - for (walk = list; walk != NULL; walk = walk->next) - { - GValue record = { 0, }; - RecordedInfo *data; - - data = (RecordedInfo *) walk->data; - - g_value_init (&record, record_type); - g_value_take_boxed (&record, - dbus_g_type_specialized_construct (record_type)); - - gmyth_dbus_server_parse_recorded_info (data, &record); - - g_ptr_array_add (*records, g_value_get_boxed (&record)); - //g_value_unset (&record); - } - - gmyth_recorded_info_list_free (list); - - return TRUE; - -} - -static gboolean -gmyth_dbus_server_get_schedule_list (GObject *obj, - GPtrArray **schedules) -{ - GList *list; - GList *walk; - gint len; - GType schedule_type; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - - len = gmyth_scheduler_get_schedule_list (priv->myth_scheduler, - &list); - - *schedules = g_ptr_array_sized_new (len); - schedule_type = GMYTH_DBUS_SCHEDULE_G_TYPE; - - for (walk = list; walk != NULL; walk = walk->next) - { - GValue schedule = { 0, }; - ScheduleInfo *data; - gchar *start_str_time; - gchar *end_str_time; - - data = (ScheduleInfo *) walk->data; - - g_value_init (&schedule, schedule_type); - g_value_take_boxed (&schedule, - dbus_g_type_specialized_construct (schedule_type)); - - start_str_time = g_time_val_to_iso8601 (data->start_time); - end_str_time = g_time_val_to_iso8601 (data->end_time); - - dbus_g_type_struct_set (&schedule, - 0, data->schedule_id, - 1, data->program_id, - 2, data->channel_id, - 3, start_str_time, - 4, end_str_time, - 5, data->title->str, - 6, data->subtitle->str, - 7, data->description->str, - 8, data->category->str, - 9, data->type, - G_MAXUINT); - - g_ptr_array_add (*schedules, g_value_get_boxed (&schedule)); - - g_free (start_str_time); - g_free (end_str_time); - } - - gmyth_schedule_info_list_free (list); - - return TRUE; -} - - -static gboolean -gmyth_dbus_server_get_thumbnail (GObject *obj, - const gchar *uri, - GByteArray **image, - GError **error) -{ - GMythFileTransfer *file_transfer; - glong filesize; - GMythFileReadResult result; - GMythDbusServerPrivate *priv; - - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - - if (!gmyth_util_file_exists (priv->myth_backend, uri)) - goto fail; - - file_transfer = gmyth_file_transfer_new (priv->myth_backend); - - if (!gmyth_file_transfer_open (file_transfer, uri)) - goto fail; - - filesize = gmyth_file_transfer_get_filesize (file_transfer); - if (filesize <= 0) - goto fail; - - *image = g_byte_array_new (); - result = gmyth_file_transfer_read (file_transfer, *image, filesize, FALSE); - if (result == GMYTH_FILE_READ_ERROR) - goto fail; - - gmyth_file_transfer_close (file_transfer); - g_object_unref (file_transfer); - - if (filesize > (*image)->len) - goto fail; - - return TRUE; - -fail: - if (*image) - g_byte_array_free (*image, TRUE); - g_object_unref(file_transfer); - return FALSE; -} - -static gboolean -gmyth_dbus_server_get_channel_icon (GObject *obj, - guint channel_id, - GByteArray **icon, - GError **error) -{ - GMythChannelInfo *channel = NULL; - guint8 *icon_data; - guint icon_length; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - g_return_val_if_fail (priv->myth_backend, FALSE); - - channel = gmyth_epg_get_channel_info (priv->myth_epg, - (gint) channel_id); - - *icon = NULL; - - if (channel == NULL) - return FALSE; - - if (!gmyth_epg_channel_has_icon(priv->myth_epg, channel)) - { - gmyth_channel_info_free (channel); - g_debug("Channel does not have icon available"); - return FALSE; - } - - icon_data = NULL; - icon_length = 0; - if (!gmyth_epg_channel_get_icon (priv->myth_epg, - channel, - &icon_data, - &icon_length)) - { - gmyth_channel_info_free (channel); - g_warning("Could not get channel icon for channel id = %u", channel_id); - return FALSE; - } - - *icon = g_byte_array_sized_new (icon_length); - *icon = g_byte_array_append (*icon, icon_data, icon_length); - - g_free (icon_data); - gmyth_channel_info_free(channel); - return TRUE; -} - - -static gboolean -gmyth_dbus_server_stop_recording (GObject *obj, - guint channel_id, - gboolean *result, - GError **error) -{ - gboolean ret = FALSE; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - ret = gmyth_scheduler_stop_recording (priv->myth_scheduler, - channel_id); - - return ret; -} - -static ScheduleInfo* -gmyth_dbus_server_new_schedule_info (const gchar* description, - guint channel_id, - guint program_id, - GTimeVal *start_vtime, - GTimeVal *end_vtime) -{ - ScheduleInfo *new_sched_info; - - new_sched_info = g_new0(ScheduleInfo, 1); - - /* record_id == -1 for generating a new id */ - new_sched_info->schedule_id = -1; - - new_sched_info->channel_id = channel_id; - new_sched_info->program_id = 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); - *new_sched_info->end_time = *end_vtime; - - /* TODO: there is no frequency field */ - /*new_sched_info->frequency = -1;*/ - - if (description != NULL) { - /* FIXME: description parameter is used as title and description */ - new_sched_info->title = g_string_new(description); - new_sched_info->description = g_string_new(description); - } - - return new_sched_info; -} - -static gboolean -gmyth_dbus_server_add_schedule (GObject *obj, - guint channel_id, - guint program_id, - const gchar *start_time, - const gchar *end_time, - gboolean recurring, - const gchar *description, - guint *schedule_id, - GError **error) -{ - ScheduleInfo *sch_info; - GTimeVal start_vtime; - GTimeVal end_vtime; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - *schedule_id = 0; - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - - g_time_val_from_iso8601 (start_time, &start_vtime); - g_time_val_from_iso8601 (end_time, &end_vtime); - sch_info = gmyth_dbus_server_new_schedule_info (description, - channel_id, - program_id, - &start_vtime, - &end_vtime); - if (sch_info != NULL) { - GMythScheduleType type; - GTimeVal t_now; - gboolean has_record; - - type = (recurring ? - GMYTH_SCHEDULE_ALL_OCCURRENCES : - GMYTH_SCHEDULE_ONE_OCCURRENCE); - - g_get_current_time (&t_now); - - has_record = gmyth_scheduler_was_recorded_before (priv->myth_scheduler, - channel_id, - (time_t) start_vtime.tv_sec); - - - if ((t_now.tv_sec >= start_vtime.tv_sec) - && (t_now.tv_sec <= end_vtime.tv_sec) && has_record) - { - GMythSocket *socket; - gboolean res = FALSE; - - socket = gmyth_backend_info_get_connected_socket (priv->myth_backend); - res = gmyth_scheduler_reactivate_schedule(priv->myth_scheduler, - channel_id, - (time_t) start_vtime.tv_sec); - if (res) { - GMythStringList *slist = gmyth_string_list_new(); - - 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_object_unref(socket); - return res; - } - else - { - if (!gmyth_scheduler_add_schedule_full (priv->myth_scheduler, - sch_info, - type)) - { - g_warning("Could not add schedule entry"); - return FALSE; - } - - (*schedule_id) = sch_info->schedule_id; - gmyth_schedule_info_free (sch_info); - return TRUE; - } - } - return FALSE; -} - -static gboolean -gmyth_dbus_server_add_exception (GObject *obj, - guint schedule_id, - guint channel_id, - guint program_id, - const gchar *start_time, - const gchar *end_time, - const gchar *description, - GError **error) -{ - ScheduleInfo *sch_info; - GTimeVal start_vtime; - GTimeVal end_vtime; - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - g_time_val_from_iso8601 (start_time, &start_vtime); - g_time_val_from_iso8601 (end_time, &end_vtime); - - sch_info = gmyth_dbus_server_new_schedule_info (description, - channel_id, - program_id, - &start_vtime, - &end_vtime); - if (sch_info != NULL) - { - if (!gmyth_scheduler_add_exception (priv->myth_scheduler, - schedule_id, - sch_info)) - { - g_warning ("Could not add schedule exception"); - gmyth_schedule_info_free (sch_info); - return FALSE; - } - - gmyth_schedule_info_free (sch_info); - return TRUE; - } - return FALSE; -} - -static gboolean -gmyth_dbus_server_remove_schedule (GObject *obj, - guint schedule_id, - GError **error) -{ - GMythDbusServerPrivate *priv; - - g_debug ("%s:%d", __FUNCTION__, __LINE__); - priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj); - - g_return_val_if_fail (priv->myth_backend, FALSE); - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE); - - return gmyth_scheduler_delete_schedule (priv->myth_scheduler, schedule_id); -} - -GMythDbusServer* -gmyth_dbus_server_start_dbus_service (void) -{ - GError *error = NULL; - DBusGProxy *proxy; - DBusGConnection *bus; - guint request_ret; - GMythDbusServer *self; - - self = g_object_new (GMYTH_DBUS_SERVER_TYPE, NULL); - g_return_val_if_fail (self, FALSE); - - /* TODO: should verify if this service was already started */ - - /* connect to session bus */ - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); - if (bus == NULL) - { - g_warning ("Could not connect to dbus: %s", error->message); - g_error_free (error); - goto fail; - } - - /* register dbus object */ - dbus_g_connection_register_g_object (bus, - GMYTH_DBUS_SERVER_PATH, G_OBJECT (self)); - - proxy = dbus_g_proxy_new_for_name (bus, DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - - /* registering download manager service */ - if (!org_freedesktop_DBus_request_name (proxy, GMYTH_DBUS_SERVER_IFACE, - 0, &request_ret, &error)) - { - g_warning ("Unable to register dbus service: %d %s", - error->code, error->message); - g_error_free (error); - goto fail; - } - - if (request_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) - { - g_warning ("Got result code %u from requesting name", request_ret); - goto fail; - } - - return self; - -fail: - g_object_unref (self); - return NULL; -} - diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/src/gmyth-dbus-server.h --- a/myth-dbus/src/gmyth-dbus-server.h Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/** - * GMyth Library - * - * @file gmyth/gmyth_backend_info.c - * - * @brief

This component represents all the MythTV backend server - * configuration information. - * - * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia. - * @author Renato Filho - * - * - * 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_DBUS_SERVER_H__ -#define __GMYTH_DBUS_SERVER_H__ - -#include -#include - -G_BEGIN_DECLS - -#define GMYTH_DBUS_SERVER_TYPE (gmyth_dbus_server_get_type ()) -#define GMYTH_DBUS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_DBUS_SERVER_TYPE, GMythDbusServer)) -#define GMYTH_DBUS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerClass)) -#define IS_GMYTH_DBUS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GMYTH_DBUS_SERVER_TYPE)) -#define IS_GMYTH_DBUS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GMYTH_DBUS_SERVER_TYPE)) -#define GMYTH_DBUS_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerClass)) - - -typedef struct _GMythDbusServer GMythDbusServer; -typedef struct _GMythDbusServerClass GMythDbusServerClass; - -struct _GMythDbusServerClass -{ - GObjectClass parent_class; -}; - -struct _GMythDbusServer -{ - GObject parent; -}; - -GType gmyth_dbus_server_get_type (void); -GMythDbusServer * gmyth_dbus_server_start_dbus_service (void); - - -G_END_DECLS - -#endif diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/src/gmyth-dbus-server.xml --- a/myth-dbus/src/gmyth-dbus-server.xml Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/src/main.c --- a/myth-dbus/src/main.c Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -#include "gmyth-dbus-server.h" - -int main (int argc, char* argv[]) -{ - GMainLoop *loop; - GMythDbusServer *srv; - - g_type_init (); - g_thread_init (NULL); - - - loop = g_main_loop_new (NULL, FALSE); - srv = gmyth_dbus_server_start_dbus_service (); - - if (srv) - g_main_loop_run (loop); - - return 0; -} diff -r 48cf27f814b7 -r 735d9b563b02 myth-dbus/tests/channel-list.py --- a/myth-dbus/tests/channel-list.py Thu Oct 25 15:38:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -import dbus -bus = dbus.SessionBus() - -proxy = bus.get_object ('br.org.indt.GMyth', '/br/org/indt/GMyth') -iface = dbus.Interface (proxy, dbus_interface='br.org.indt.GMyth') -iface.Connect ('192.168.2.222', 6543, 'mythtv', 'mythtv') -print iface.Connected () -print iface.GetChannelList () -print "--------------------------------------------------------" -print iface.GetRecordedList () -#print iface.FileExists ("teste.nuv") -#print iface.GetProgramList (1003, ')