Mercurial > audlegacy

changeset 2696:c00850315ce1 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] Fixed licensing issues and DBus node/interface names. Also implemented playlist advance and reverse.
author magma
date Sat, 05 May 2007 16:24:08 -0700
parents 4c4c8b294287
children e6ab1d700a69
files ChangeLog src/audacious/build_stamp.c src/audacious/dbus.c src/audacious/dbus.h src/audacious/objects.xml
diffstat 5 files changed, 73 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- 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 <bnt@interchange.ubc.ca>
+  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 <bnt@interchange.ubc.ca>
   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.
--- 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 <glib.h>
-const gchar *svn_stamp = "20070505-4414";
+const gchar *svn_stamp = "20070505-4416";
--- 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 <bnt@interchange.ubc.ca>, (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;
 }
 
--- 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 <bnt@interchange.ubc.ca>, (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 <dbus/dbus-glib.h>
 
-#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,
--- 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.
+ -->
+
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
@@ -41,7 +60,6 @@
     CMD_TOGGLE_AOT
     CMD_SHOW_ABOUT_BOX
     CMD_EJECT
-    CMD_PING?
     CMD_GET_BALANCE
     CMD_MAIN_WIN_TOGGLE
     CMD_IS_EQ_WIN
@@ -72,9 +90,9 @@
     CMD_PLAYLIST_GET_TUPLE_DATA
 -->
 
-<node name="/org/audacious">
+<node name="/org/atheme/audacious">
     <!-- Audacious General Information -->
-    <interface name="org.audacious.general">
+    <interface name="org.atheme.audacious.general">
         <!-- Audacious version -->
         <method name="Version">
             <arg type="s" direction="out" name="version"/>
@@ -82,7 +100,7 @@
     </interface>
 
     <!-- Playback Information/Manipulation -->
-    <interface name="org.audacious.playback">
+    <interface name="org.atheme.audacious.playback">
         <!-- Begin or resume playback -->
         <method name="Play"/>
 
@@ -128,7 +146,7 @@
     </interface>
 
     <!-- Playlist Information/Manipulation -->
-    <interface name="org.audacious.playlist">
+    <interface name="org.atheme.audacious.playlist">
         <!-- Playlist position -->
         <method name="Position">
             <!-- Return position of current song in current playlist -->