From 4ed4e1f191c8a221234339eca73529ebc254046a Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Thu, 14 Jan 2010 00:49:34 +0100 Subject: [PATCH] First version for the N900 (headphoned 1.5) Thanks to Joost Kop for the research wrt the mafw D-Bus interfaces and the initial patch. --- AUTHORS | 3 + COPYING | 340 ++++++++++++++++++++++++++++++++++++ debian/changelog | 7 + debian/control | 6 +- debian/headphoned.zheadphoned.init | 101 ----------- debian/postinst | 6 + debian/postrm | 5 + debian/rules | 1 - headphoned.launch | 19 ++ makefile | 3 + src/config.h | 13 ++ src/headphoned.c | 40 +++-- upstart/headphoned | 7 + 13 files changed, 435 insertions(+), 116 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING delete mode 100644 debian/headphoned.zheadphoned.init create mode 100644 debian/postinst create mode 100644 headphoned.launch create mode 100644 src/config.h create mode 100644 upstart/headphoned diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..5900844 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Thomas Perl +Joost Kop + diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..b7b5f53 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, 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 St, 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 --git a/debian/changelog b/debian/changelog index a26fb30..ccdd2f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +headphoned (1.5) fremantle; urgency=low + + * First release for Maemo 5 + * Upstart support + + -- Thomas Perl Wed, 13 Jan 2010 18:57:22 +0100 + headphoned (1.4) diablo; urgency=low * Add support for pausing MPlayer diff --git a/debian/control b/debian/control index 238ba30..366ea90 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,9 @@ Depends: ${shlibs:Depends} XB-Maemo-Display-Name: Headphone daemon Description: Pauses the media player when headphones are unplugged The headphone daemon sits in the background and watches the - connection state of headphones on the N800/N810. Whenever the - headphones are unplugged, headphoned will send a "pause" signal - to the mediaplayer to avoid "public transport situations". + connection state of headphones on the N800/N810 and N900. Whenever + the headphones are unplugged, headphoned will send a "pause" + signal to the mediaplayer to avoid "public transport situations". . Supported applications: Media Player, Panucci and MPlayer XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAAAXNSR0IArs4c diff --git a/debian/headphoned.zheadphoned.init b/debian/headphoned.zheadphoned.init deleted file mode 100644 index 08ff60b..0000000 --- a/debian/headphoned.zheadphoned.init +++ /dev/null @@ -1,101 +0,0 @@ -#! /bin/sh -# -# skeleton example file to build /etc/init.d/ scripts. -# This file should be used to construct scripts for /etc/init.d. -# -# Written by Miquel van Smoorenburg . -# Modified for Debian -# by Ian Murdock . -# -# Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl -# - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/headphoned -NAME=headphoned -USER=user -DESC="Headphone daemon" - -# XXX: The following is needed for the D-Bus connection to work -export DBUS_SESSION_BUS_ADDRESS='unix:path=/tmp/session_bus_socket' -# XXX end - -# Add the headphoned FIFO to MPlayer's global configuration -CONFIG_LINE="input:file=/etc/headphoned/mplayer-input" -MPLAYER_CONF="/etc/mplayer/mplayer.conf" -if [ -f "$MPLAYER_CONF" ]; then - if ! grep "$CONFIG_LINE" "$MPLAYER_CONF" >/dev/null; then - echo -n "Updating $MPLAYER_CONF... " - echo $CONFIG_LINE >>$MPLAYER_CONF - echo "done." - fi -fi -# End Add the headphoned FIFO to MPlayer's global configuration - -test -x $DAEMON || exit 0 - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - -b --user $USER --chuid $USER --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - _PIDS=`pidof $DAEMON || echo ""` - if [ "$_PIDS" != "" ]; then - kill $_PIDS - fi - #start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ - # --user $USER --chuid $USER --exec $DAEMON - echo "$NAME." - ;; - reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/$NAME.pid --exec $DAEMON - ;; - force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart" except that it does nothing if the - # daemon isn't already running. - # check wether $DAEMON is running. If so, restart - #start-stop-daemon --stop --test --quiet --pidfile \ - # --user $USER --chuid $USER /var/run/$NAME.pid --exec $DAEMON \ - #&& $0 restart \ - #|| exit 0 - ;; - restart) - echo -n "Restarting $DESC: " - _PIDS=`pidof $DAEMON || echo ""` - if [ "$_PIDS" != "" ]; then - kill $_PIDS - fi - #start-stop-daemon --stop --quiet --pidfile \ - # --user $USER --chuid $USER /var/run/$NAME.pid --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --pidfile -b --user $USER \ - --chuid $USER /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..5fe026c --- /dev/null +++ b/debian/postinst @@ -0,0 +1,6 @@ +#!/bin/sh + +#DEBHELPER# + +start --quiet headphoned + diff --git a/debian/postrm b/debian/postrm index 1b92f0f..8a5220d 100644 --- a/debian/postrm +++ b/debian/postrm @@ -2,6 +2,11 @@ #DEBHELPER# +#stop --quiet headphoned + +# FIXME: Ideally, this should make proper use of Upstart +killall -q -SIGHUP headphoned + CONFIG_LINE="input:file=\/etc\/headphoned\/mplayer-input" MPLAYER_CONF="/etc/mplayer/mplayer.conf" diff --git a/debian/rules b/debian/rules index b495e60..998bad1 100755 --- a/debian/rules +++ b/debian/rules @@ -58,7 +58,6 @@ binary-arch: build install dh_installchangelogs dh_installdocs dh_install - dh_installinit --name=zheadphoned --update-rcd-params='defaults 99' dh_installman dh_link dh_strip diff --git a/headphoned.launch b/headphoned.launch new file mode 100644 index 0000000..68b5079 --- /dev/null +++ b/headphoned.launch @@ -0,0 +1,19 @@ +#!/bin/sh + +# Obtain the D-Bus session bus address +. /tmp/session_bus_address.user + +# Add the headphoned FIFO to MPlayer's global configuration +CONFIG_LINE="input:file=/etc/headphoned/mplayer-input" +MPLAYER_CONF="/etc/mplayer/mplayer.conf" +if [ -f "$MPLAYER_CONF" ]; then + if ! grep "$CONFIG_LINE" "$MPLAYER_CONF" >/dev/null; then + echo -n "Updating $MPLAYER_CONF... " + echo $CONFIG_LINE >>$MPLAYER_CONF + echo "done." + fi +fi +# End Add the headphoned FIFO to MPlayer's global configuration + +/usr/sbin/headphoned & + diff --git a/makefile b/makefile index 46e3f6b..0513c38 100644 --- a/makefile +++ b/makefile @@ -12,9 +12,12 @@ $(PROG): $(OBJS) install: $(PROG) install $(PROG) $(DESTDIR)$(PREFIX)/sbin/$(PROG) + install $(PROG).launch $(DESTDIR)$(PREFIX)/sbin/$(PROG).launch mkdir -p $(DESTDIR)/etc/$(PROG) mkfifo $(DESTDIR)/etc/$(PROG)/mplayer-input chown user:users $(DESTDIR)/etc/$(PROG)/mplayer-input + mkdir -p $(DESTDIR)/etc/event.d/ + install upstart/$(PROG) $(DESTDIR)/etc/event.d/ clean: rm -f $(PROG) $(OBJS) diff --git a/src/config.h b/src/config.h new file mode 100644 index 0000000..7f4b835 --- /dev/null +++ b/src/config.h @@ -0,0 +1,13 @@ +/** + * Configuration file for headphoned + **/ + +// Define Diablo if you are compiling for Maemo 4 +//#define DIABLO + +// Volume control is currently broken, as something is messing +// with the controls from outside this process in GConf.. +//#define ENABLE_VOLUME_CONTROL +#define ENABLE_PAUSE_ON_DISCONNECT + + diff --git a/src/headphoned.c b/src/headphoned.c index adfdf55..27d2d09 100644 --- a/src/headphoned.c +++ b/src/headphoned.c @@ -1,5 +1,5 @@ /** - * headphoned for the Nokia N8x0 + * headphoned for the Nokia N8x0 and the N900 * * The headphone daemon watches the state of the headphone * plug (connected, disconnected) and carries out actions @@ -9,7 +9,23 @@ * * Send "pause" to the media player on disconnect * * Maintain different volume settings for each state * - * Copyright (c) 2009-10-21 Thomas Perl + * Initial working version: 2009-10-21 + * + * Copyright (c) 2009-2010 Thomas Perl + * + * 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 package; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA **/ #include @@ -20,15 +36,23 @@ #include #include +#include "config.h" + #define STATE_FILE "/sys/devices/platform/gpio-switch/headphone/state" #define STATE_CONNECTED_STR "connected" #define STATE_DISCONNECTED_STR "disconnected" #define GCONF_VOLUME_CONTROL "/apps/osso/sound/master_volume" -#define MEDIA_SERVER_SRVC "com.nokia.osso_media_server" -#define MEDIA_SERVER_PATH "/com/nokia/osso_media_server" -#define MEDIA_SERVER_INTF "com.nokia.osso_media_server.music" +#ifdef DIABLO +# define MEDIA_SERVER_SRVC "com.nokia.osso_media_server" +# define MEDIA_SERVER_PATH "/com/nokia/osso_media_server" +# define MEDIA_SERVER_INTF "com.nokia.osso_media_server.music" +#else +# define MEDIA_SERVER_SRVC "com.nokia.mafw.renderer.Mafw-Gst-Renderer-Plugin.gstrenderer" +# define MEDIA_SERVER_PATH "/com/nokia/mafw/renderer/gstrenderer" +# define MEDIA_SERVER_INTF "com.nokia.mafw.renderer" +#endif #define PANUCCI_SRVC "org.panucci.panucciInterface" #define PANUCCI_PATH "/panucciInterface" @@ -36,12 +60,6 @@ #define MPLAYER_FIFO "/etc/headphoned/mplayer-input" -// Volume control is currently broken, as something is messing -// with the controls from outside this process in GConf.. -//#define ENABLE_VOLUME_CONTROL -#define ENABLE_PAUSE_ON_DISCONNECT - - enum { STATE_UNKNOWN, STATE_CONNECTED, STATE_DISCONNECTED, STATE_COUNT }; typedef struct { diff --git a/upstart/headphoned b/upstart/headphoned new file mode 100644 index 0000000..b355f28 --- /dev/null +++ b/upstart/headphoned @@ -0,0 +1,7 @@ +author "Thomas Perl" +description "Start the Headphone Daemon to watch the headphone port" + +start on started hildon-desktop + +exec /usr/sbin/headphoned.launch + -- 1.7.9.5