# HG changeset patch # User magma # Date 1178407448 25200 # Node ID c00850315ce161a2f64b7d7f6ee3341162bd37c5 # Parent 4c4c8b2942873067e70f1e4a12c1e70c7ffe629d [svn] Fixed licensing issues and DBus node/interface names. Also implemented playlist advance and reverse. diff -r 4c4c8b294287 -r c00850315ce1 ChangeLog --- a/ChangeLog Sat May 05 16:04:39 2007 -0700 +++ b/ChangeLog Sat May 05 16:24:08 2007 -0700 @@ -1,3 +1,14 @@ +2007-05-05 23:04:39 +0000 Ben Tucker + revision [4416] + Fixed formatting. Tabs + tw=2 ==> spaces + tw=4. + + trunk/src/audacious/dbus.c | 192 ++++++++++---------- + trunk/src/audacious/dbus.h | 32 +-- + trunk/src/audacious/main.c | 2 + trunk/src/audacious/objects.xml | 372 ++++++++++++++++++++-------------------- + 4 files changed, 299 insertions(+), 299 deletions(-) + + 2007-05-05 22:37:54 +0000 Ben Tucker revision [4414] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods. diff -r 4c4c8b294287 -r c00850315ce1 src/audacious/build_stamp.c --- a/src/audacious/build_stamp.c Sat May 05 16:04:39 2007 -0700 +++ b/src/audacious/build_stamp.c Sat May 05 16:24:08 2007 -0700 @@ -1,2 +1,2 @@ #include -const gchar *svn_stamp = "20070505-4414"; +const gchar *svn_stamp = "20070505-4416"; diff -r 4c4c8b294287 -r c00850315ce1 src/audacious/dbus.c --- a/src/audacious/dbus.c Sat May 05 16:04:39 2007 -0700 +++ b/src/audacious/dbus.c Sat May 05 16:24:08 2007 -0700 @@ -1,22 +1,21 @@ /* -* -* Author: Ben Tucker , (C) 2007 -* -* 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 -* -*/ + * Audacious: A cross-platform multimedia player + * Copyright (c) 2007 Ben Tucker + * + * 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; under version 2 of the License. + * + * 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. + */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -161,10 +160,12 @@ } gboolean audacious_remote_advance(RemoteObject *obj, GError **error) { + playlist_next(playlist_get_active()); return TRUE; } gboolean audacious_remote_reverse(RemoteObject *obj, GError **error) { + playlist_prev(playlist_get_active()); return TRUE; } diff -r 4c4c8b294287 -r c00850315ce1 src/audacious/dbus.h --- a/src/audacious/dbus.h Sat May 05 16:04:39 2007 -0700 +++ b/src/audacious/dbus.h Sat May 05 16:24:08 2007 -0700 @@ -1,22 +1,21 @@ /* -* -* Author: Ben Tucker , (C) 2007 -* -* 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 -* -*/ + * Audacious: A cross-platform multimedia player + * Copyright (c) 2007 Ben Tucker + * + * 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; under version 2 of the License. + * + * 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. + */ #ifndef _AUDDBUS_H #define _AUDDBUS_H @@ -26,8 +25,8 @@ #define DBUS_API_SUBJECT_TO_CHANGE #include -#define DBUS_SERVICE "org.audacious" -#define DBUS_OBJECT_PATH "/org/audacious" +#define DBUS_SERVICE "org.atheme.audacious" +#define DBUS_OBJECT_PATH "/org/atheme/audacious" typedef struct { GObject parent; @@ -39,8 +38,6 @@ } RemoteObjectClass; RemoteObject *init_dbus(); -//static void audacious_remote_init(RemoteObject *object); -//static void audacious_remote_class_init(RemoteObjectClass *class); // Audacious General Information gboolean audacious_remote_version(RemoteObject *obj, gchar **version, diff -r 4c4c8b294287 -r c00850315ce1 src/audacious/objects.xml --- a/src/audacious/objects.xml Sat May 05 16:04:39 2007 -0700 +++ b/src/audacious/objects.xml Sat May 05 16:24:08 2007 -0700 @@ -1,3 +1,22 @@ +<-- + * Audacious: A cross-platform multimedia player + * Copyright (c) 2007 Ben Tucker + * + * 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; under version 2 of the License. + * + * 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. + --> + - + - + @@ -82,7 +100,7 @@ - + @@ -128,7 +146,7 @@ - +