[Goodies-commits] r6638 - in xfmpc/trunk: . po src
Mike Massonnet
mmassonnet at xfce.org
Tue Feb 3 21:38:26 CET 2009
Author: mmassonnet
Date: 2009-02-03 20:38:26 +0000 (Tue, 03 Feb 2009)
New Revision: 6638
Removed:
xfmpc/trunk/src/interface-ui.xml
Modified:
xfmpc/trunk/Makefile.am
xfmpc/trunk/configure.in.in
xfmpc/trunk/po/POTFILES.in
xfmpc/trunk/po/POTFILES.skip
xfmpc/trunk/src/Makefile.am
xfmpc/trunk/src/dbbrowser.c
xfmpc/trunk/src/dbbrowser.h
xfmpc/trunk/src/extended-interface.c
xfmpc/trunk/src/extended-interface.h
xfmpc/trunk/src/interface.c
xfmpc/trunk/src/interface.h
xfmpc/trunk/src/main-ui.xml
xfmpc/trunk/src/main.c
xfmpc/trunk/src/mpdclient.c
xfmpc/trunk/src/mpdclient.h
xfmpc/trunk/src/playlist.c
xfmpc/trunk/src/playlist.h
xfmpc/trunk/src/preferences.c
xfmpc/trunk/src/preferences.h
Log:
General cleanup
* configure.in.in:
- Move from AC_PROG_CC to AM_PROG_CC_C_O as suggested by the autotools output
to support multiple program rules
- Add call to AC_PROG_LIBTOOL as required by recent versions of libtool
* Makefile.am:
- Add distclean rule
* po/POTFILES.*:
- Clean up
* src/*.c, src/*.h:
- Store private pointer in class structure to avoid repeatitive and boring
calls via the GET_PRIVATE macro
- Copyright headers
- Merge the action entries
- Replace calls of g_signal_emit_by_name() against g_signal_emit()
* src/extended-interface.c:
- Drop the repeat and random pointers out from the private data structure
Modified: xfmpc/trunk/Makefile.am
===================================================================
--- xfmpc/trunk/Makefile.am 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/Makefile.am 2009-02-03 20:38:26 UTC (rev 6638)
@@ -31,6 +31,18 @@
$(desktop_in_files)
DISTCLEANFILES = \
+ aclocal.m4 \
+ compile \
+ config.guess \
+ config.h.in \
+ config.sub \
+ configure \
+ configure.ac \
+ depcomp \
+ install-sh \
+ ltmain.sh \
+ missing \
+ mkinstalldirs \
intltool-extract \
intltool-merge \
intltool-update \
Modified: xfmpc/trunk/configure.in.in
===================================================================
--- xfmpc/trunk/configure.in.in 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/configure.in.in 2009-02-03 20:38:26 UTC (rev 6638)
@@ -35,7 +35,8 @@
dnl ********************************
dnl *** Check for basic programs ***
dnl ********************************
-AC_PROG_CC()
+AM_PROG_CC_C_O()
+AC_PROG_LIBTOOL()
AC_PROG_LD()
AC_PROG_INSTALL()
AC_PROG_INTLTOOL()
Modified: xfmpc/trunk/po/POTFILES.in
===================================================================
--- xfmpc/trunk/po/POTFILES.in 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/po/POTFILES.in 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,4 +1,9 @@
+src/dbbrowser.c
src/extended-interface.c
src/interface.c
+src/main.c
src/mpdclient.c
+src/playlist.c
+src/preferences.c
+src/xfce-arrow-button.c
xfmpc.desktop.in
Modified: xfmpc/trunk/po/POTFILES.skip
===================================================================
--- xfmpc/trunk/po/POTFILES.skip 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/po/POTFILES.skip 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,2 +0,0 @@
-src/main.c
-src/preferences.c
Modified: xfmpc/trunk/src/Makefile.am
===================================================================
--- xfmpc/trunk/src/Makefile.am 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/Makefile.am 2009-02-03 20:38:26 UTC (rev 6638)
@@ -40,18 +40,13 @@
if MAINTAINER_MODE
DISTCLEANFILES = \
- main-ui.h \
- interface-ui.h
+ main-ui.h
BUILT_SOURCES = \
- main-ui.h \
- interface-ui.h
+ main-ui.h
main-ui.h: Makefile $(srcdir)/main-ui.xml
exo-csource --strip-comments --strip-content --static --name=main_ui $(srcdir)/main-ui.xml > main-ui.h
-
-interface-ui.h: Makefile $(srcdir)/interface-ui.xml
- exo-csource --strip-comments --strip-content --static --name=xfmpc_interface_ui $(srcdir)/interface-ui.xml > interface-ui.h
endif
EXTRA_DIST = \
Modified: xfmpc/trunk/src/dbbrowser.c
===================================================================
--- xfmpc/trunk/src/dbbrowser.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/dbbrowser.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
* 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
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
#define BORDER 4
-#define XFMPC_DBBROWSER_GET_PRIVATE(o) \
+#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFMPC_TYPE_DBBROWSER, XfmpcDbbrowserPrivate))
@@ -80,9 +80,10 @@
struct _XfmpcDbbrowser
{
GtkVBox parent;
- XfmpcDbbrowserPrivate *priv;
XfmpcPreferences *preferences;
XfmpcMpdclient *mpdclient;
+ /*<private>*/
+ XfmpcDbbrowserPrivate *priv;
};
struct _XfmpcDbbrowserPrivate
@@ -150,7 +151,7 @@
static void
xfmpc_dbbrowser_init (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = dbbrowser->priv = GET_PRIVATE (dbbrowser);
dbbrowser->preferences = xfmpc_preferences_get ();
dbbrowser->mpdclient = xfmpc_mpdclient_get ();
@@ -261,7 +262,7 @@
xfmpc_dbbrowser_finalize (GObject *object)
{
XfmpcDbbrowser *dbbrowser = XFMPC_DBBROWSER (object);
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
g_object_set (G_OBJECT (dbbrowser->preferences),
"dbbrowser-last-path", priv->wdir,
@@ -283,8 +284,7 @@
void
xfmpc_dbbrowser_clear (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
-
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
gtk_list_store_clear (priv->store);
}
@@ -294,7 +294,7 @@
gchar *basename,
gboolean is_dir)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
GdkPixbuf *pixbuf;
GtkTreeIter iter;
@@ -315,7 +315,7 @@
void
xfmpc_dbbrowser_add_selected_rows (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
GtkTreeModel *store = GTK_TREE_MODEL (priv->store);
GtkTreeIter iter;
GList *list;
@@ -352,7 +352,7 @@
void
xfmpc_dbbrowser_reload (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
gchar *filename;
gchar *basename;
gboolean is_dir;
@@ -401,7 +401,7 @@
xfmpc_dbbrowser_search (XfmpcDbbrowser *dbbrowser,
const gchar *query)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
gchar *filename;
gchar *basename;
gint i = 0;
@@ -461,7 +461,7 @@
xfmpc_dbbrowser_set_wdir (XfmpcDbbrowser *dbbrowser,
const gchar *dir)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
g_free (priv->last_wdir);
priv->last_wdir = priv->wdir;
@@ -471,15 +471,14 @@
gboolean
xfmpc_dbbrowser_wdir_is_root (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
-
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
return priv->wdir[0] == '\0';
}
gchar *
xfmpc_dbbrowser_get_parent_wdir (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
gchar *filename;
filename = g_strrstr (priv->wdir, "/");
@@ -498,7 +497,7 @@
GtkTreePath *path,
GtkTreeViewColumn *column)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
GtkTreeIter iter;
gchar *filename;
gboolean is_dir;
@@ -529,7 +528,7 @@
cb_key_pressed (XfmpcDbbrowser *dbbrowser,
GdkEventKey *event)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
GtkTreeSelection *selection;
gchar *filename;
@@ -564,7 +563,7 @@
cb_button_pressed (XfmpcDbbrowser *dbbrowser,
GdkEventButton *event)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
GtkTreeSelection *selection;
GtkTreePath *path;
@@ -593,15 +592,13 @@
cb_popup_menu (XfmpcDbbrowser *dbbrowser)
{
popup_menu (dbbrowser);
-
return TRUE;
}
static void
popup_menu (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
-
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
gtk_menu_popup (GTK_MENU (priv->menu),
NULL, NULL,
NULL, NULL,
@@ -614,7 +611,7 @@
static void
cb_search_entry_activated (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
const gchar *entry_text = gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
if (entry_text[0] == '\0')
@@ -638,7 +635,7 @@
cb_search_entry_key_released (XfmpcDbbrowser *dbbrowser,
GdkEventKey *event)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
if (event->type != GDK_KEY_RELEASE)
return FALSE;
@@ -654,7 +651,7 @@
static void
cb_search_entry_changed (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
if (priv->search_timeout > 0)
g_source_remove (priv->search_timeout);
@@ -674,7 +671,7 @@
static void
timeout_search_destroy (XfmpcDbbrowser *dbbrowser)
{
- XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER_GET_PRIVATE (dbbrowser);
+ XfmpcDbbrowserPrivate *priv = XFMPC_DBBROWSER (dbbrowser)->priv;
priv->search_timeout = 0;
}
Modified: xfmpc/trunk/src/dbbrowser.h
===================================================================
--- xfmpc/trunk/src/dbbrowser.h 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/dbbrowser.h 2009-02-03 20:38:26 UTC (rev 6638)
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __XFMPC_DBBROWSER_H__
Modified: xfmpc/trunk/src/extended-interface.c
===================================================================
--- xfmpc/trunk/src/extended-interface.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/extended-interface.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
* 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
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -33,7 +33,7 @@
#define BORDER 4
-#define XFMPC_EXTENDED_INTERFACE_GET_PRIVATE(o) \
+#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFMPC_TYPE_EXTENDED_INTERFACE, XfmpcExtendedInterfacePrivate))
@@ -82,8 +82,9 @@
struct _XfmpcExtendedInterface
{
GtkVBox parent;
- XfmpcExtendedInterfacePrivate *priv;
XfmpcMpdclient *mpdclient;
+ /*<private>*/
+ XfmpcExtendedInterfacePrivate *priv;
};
struct _XfmpcExtendedInterfacePrivate
@@ -91,8 +92,6 @@
GtkListStore *list_store;
GtkWidget *combobox;
GtkWidget *notebook;
- GtkWidget *repeat;
- GtkWidget *random;
GtkWidget *context_button;
GtkWidget *context_menu;
};
@@ -148,7 +147,7 @@
static void
xfmpc_extended_interface_init (XfmpcExtendedInterface *extended_interface)
{
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (extended_interface);
+ XfmpcExtendedInterfacePrivate *priv = extended_interface->priv = GET_PRIVATE (extended_interface);
extended_interface->mpdclient = xfmpc_mpdclient_get ();
@@ -218,14 +217,12 @@
static void
xfmpc_extended_interface_dispose (GObject *object)
{
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (object);
+ XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE (object)->priv;
if (GTK_IS_MENU (priv->context_menu))
{
gtk_menu_detach (GTK_MENU (priv->context_menu));
priv->context_menu = NULL;
- priv->repeat = NULL;
- priv->random = NULL;
}
if (GTK_IS_WIDGET (priv->context_button))
@@ -241,7 +238,6 @@
xfmpc_extended_interface_finalize (GObject *object)
{
XfmpcExtendedInterface *extended_interface = XFMPC_EXTENDED_INTERFACE (object);
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (extended_interface);
g_object_unref (G_OBJECT (extended_interface->mpdclient));
(*G_OBJECT_CLASS (parent_class)->finalize) (object);
}
@@ -259,8 +255,7 @@
GtkWidget *child,
const gchar *title)
{
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (extended_interface);
-
+ XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE (extended_interface)->priv;
GtkTreeIter iter;
gtk_list_store_append (priv->list_store, &iter);
@@ -280,7 +275,7 @@
xfmpc_extended_interface_context_menu_new (XfmpcExtendedInterface *extended_interface,
GtkWidget *attach_widget)
{
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (extended_interface);
+ XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE (extended_interface)->priv;
GtkWidget *menu = priv->context_menu = gtk_menu_new ();
gtk_menu_set_screen (GTK_MENU (menu), gtk_widget_get_screen (GTK_WIDGET (attach_widget)));
@@ -288,21 +283,21 @@
g_signal_connect (menu, "deactivate",
G_CALLBACK (cb_context_menu_deactivate), attach_widget);
- priv->repeat = gtk_check_menu_item_new_with_label (_("Repeat"));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->repeat),
+ GtkWidget *mi = gtk_check_menu_item_new_with_label (_("Repeat"));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi),
xfmpc_mpdclient_get_repeat (extended_interface->mpdclient));
- g_signal_connect_swapped (priv->repeat, "activate",
+ g_signal_connect_swapped (mi, "activate",
G_CALLBACK (cb_repeat_switch), extended_interface);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), priv->repeat);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- priv->random = gtk_check_menu_item_new_with_label (_("Random"));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->random),
+ mi = gtk_check_menu_item_new_with_label (_("Random"));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi),
xfmpc_mpdclient_get_random (extended_interface->mpdclient));
- g_signal_connect_swapped (priv->random, "activate",
+ g_signal_connect_swapped (mi, "activate",
G_CALLBACK (cb_random_switch), extended_interface);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), priv->random);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- GtkWidget *mi = gtk_separator_menu_item_new ();
+ mi = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
GtkWidget *image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
@@ -425,8 +420,7 @@
cb_interface_changed (GtkComboBox *widget,
XfmpcExtendedInterface *extended_interface)
{
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (extended_interface);
-
+ XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE (extended_interface)->priv;
GtkWidget *child;
GtkTreeIter iter;
gint i;
@@ -477,7 +471,7 @@
static void
popup_context_menu (XfmpcExtendedInterface *extended_interface)
{
- XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (extended_interface);
+ XfmpcExtendedInterfacePrivate *priv = XFMPC_EXTENDED_INTERFACE (extended_interface)->priv;
if (GTK_IS_MENU (priv->context_menu))
gtk_menu_detach (GTK_MENU (priv->context_menu));
Modified: xfmpc/trunk/src/extended-interface.h
===================================================================
--- xfmpc/trunk/src/extended-interface.h 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/extended-interface.h 2009-02-03 20:38:26 UTC (rev 6638)
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __XFMPC_EXTENDED_INTERFACE_H__
Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/interface.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
* 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
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
#define BORDER 4
-#define XFMPC_INTERFACE_GET_PRIVATE(o) \
+#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFMPC_TYPE_INTERFACE, XfmpcInterfacePrivate))
@@ -55,21 +55,8 @@
gint volume);
static void cb_stopped (XfmpcInterface *interface);
-static void xfmpc_interface_action_previous (GtkAction *action,
- XfmpcInterface *interface);
-static void xfmpc_interface_action_pp (GtkAction *action,
- XfmpcInterface *interface);
-static void xfmpc_interface_action_stop (GtkAction *action,
- XfmpcInterface *interface);
-static void xfmpc_interface_action_next (GtkAction *action,
- XfmpcInterface *interface);
-static void xfmpc_interface_action_volume (GtkAction *action,
- XfmpcInterface *interface);
-static void xfmpc_interface_action_close (GtkAction *action,
- XfmpcInterface *interface);
-
static GObjectClass *parent_class = NULL;
@@ -119,7 +106,7 @@
static void
xfmpc_interface_init (XfmpcInterface *interface)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = interface->priv = GET_PRIVATE (interface);
gtk_container_set_border_width (GTK_CONTAINER (interface), BORDER);
interface->preferences = xfmpc_preferences_get ();
@@ -256,7 +243,7 @@
xfmpc_interface_set_title (XfmpcInterface *interface,
const gchar *title)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
gtk_label_set_text (GTK_LABEL (priv->title), title);
}
@@ -265,7 +252,7 @@
xfmpc_interface_set_subtitle (XfmpcInterface *interface,
const gchar *subtitle)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
gtk_label_set_text (GTK_LABEL (priv->subtitle), subtitle);
}
@@ -282,7 +269,7 @@
xfmpc_interface_set_pp (XfmpcInterface *interface,
gboolean play)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
GtkWidget *image = gtk_bin_get_child (GTK_BIN (priv->button_pp));
@@ -296,7 +283,7 @@
xfmpc_interface_progress_box_press_event (XfmpcInterface *interface,
GdkEventButton *event)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
if (G_UNLIKELY (event->type != GDK_BUTTON_PRESS || event->button != 1))
return FALSE;
@@ -324,7 +311,7 @@
xfmpc_interface_set_volume (XfmpcInterface *interface,
guint8 volume)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
gtk_scale_button_set_value (GTK_SCALE_BUTTON (priv->button_volume), volume);
}
@@ -332,7 +319,7 @@
void
xfmpc_interface_popup_volume (XfmpcInterface *interface)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
g_signal_emit_by_name (priv->button_volume, "popup", G_TYPE_NONE);
}
@@ -342,7 +329,7 @@
gint time,
gint time_total)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
gint min, sec, min_total, sec_total;
gchar *text;
@@ -418,7 +405,7 @@
cb_pp_changed (XfmpcInterface *interface,
gboolean is_playing)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
xfmpc_interface_set_pp (interface, is_playing);
@@ -447,7 +434,7 @@
static void
cb_stopped (XfmpcInterface *interface)
{
- XfmpcInterfacePrivate *priv = XFMPC_INTERFACE_GET_PRIVATE (interface);
+ XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
xfmpc_interface_set_pp (interface, FALSE);
xfmpc_interface_set_time (interface, 0, 0);
Modified: xfmpc/trunk/src/interface.h
===================================================================
--- xfmpc/trunk/src/interface.h 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/interface.h 2009-02-03 20:38:26 UTC (rev 6638)
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __XFMPC_INTERFACE_H__
@@ -46,9 +46,10 @@
struct _XfmpcInterface
{
GtkVBox parent;
- XfmpcInterfacePrivate *priv;
XfmpcPreferences *preferences;
XfmpcMpdclient *mpdclient;
+ /*<private>*/
+ XfmpcInterfacePrivate *priv;
};
struct _XfmpcInterfacePrivate
Modified: xfmpc/trunk/src/main-ui.xml
===================================================================
--- xfmpc/trunk/src/main-ui.xml 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/main-ui.xml 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,3 +1,11 @@
<ui>
+ <!-- Main -->
<accelerator action="quit" />
+
+ <!-- XfmpcInterface -->
+ <accelerator action="previous" />
+ <accelerator action="pp" />
+ <accelerator action="stop" />
+ <accelerator action="next" />
+ <accelerator action="volume" />
</ui>
Modified: xfmpc/trunk/src/main.c
===================================================================
--- xfmpc/trunk/src/main.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/main.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
* 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
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -36,7 +36,6 @@
#include "mpdclient.h"
#include "main-ui.h"
#include "interface.h"
-#include "interface-ui.h"
#include "extended-interface.h"
#define BORDER 4
@@ -47,33 +46,30 @@
GdkEventWindowState *event);
static gboolean cb_window_closed (GtkWidget *window,
GdkEvent *event);
-static void action_main_close (GtkAction *action,
+static void action_close (GtkAction *action,
GtkWidget *window);
-static void action_xfmpc_interface_previous (GtkAction *action,
- XfmpcInterface *interface);
-static void action_xfmpc_interface_pp (GtkAction *action,
- XfmpcInterface *interface);
-static void action_xfmpc_interface_stop (GtkAction *action,
- XfmpcInterface *interface);
-static void action_xfmpc_interface_next (GtkAction *action,
- XfmpcInterface *interface);
-static void action_xfmpc_interface_volume (GtkAction *action,
- XfmpcInterface *interface);
+static void action_previous (GtkAction *action,
+ GtkWidget *window);
+static void action_pp (GtkAction *action,
+ GtkWidget *window);
+static void action_stop (GtkAction *action,
+ GtkWidget *window);
+static void action_next (GtkAction *action,
+ GtkWidget *window);
+static void action_volume (GtkAction *action,
+ GtkWidget *window);
-static const GtkActionEntry action_entries_main[] =
+static const GtkActionEntry action_entries[] =
{
- { "quit", NULL, "", "<control>q", NULL, G_CALLBACK (action_main_close), },
-};
+ { "quit", NULL, "", "<control>q", NULL, G_CALLBACK (action_close), },
-static const GtkActionEntry action_entries_xfmpc_interface[] =
-{
- { "previous", NULL, "", "<control>b", NULL, G_CALLBACK (action_xfmpc_interface_previous), },
- { "pp", NULL, "", "<control>p", NULL, G_CALLBACK (action_xfmpc_interface_pp), },
- { "stop", NULL, "", "<control>s", NULL, G_CALLBACK (action_xfmpc_interface_stop), },
- { "next", NULL, "", "<control>f", NULL, G_CALLBACK (action_xfmpc_interface_next), },
- { "volume", NULL, "", "<control>v", NULL, G_CALLBACK (action_xfmpc_interface_volume), },
+ { "previous", NULL, "", "<control>b", NULL, G_CALLBACK (action_previous), },
+ { "pp", NULL, "", "<control>p", NULL, G_CALLBACK (action_pp), },
+ { "stop", NULL, "", "<control>s", NULL, G_CALLBACK (action_stop), },
+ { "next", NULL, "", "<control>f", NULL, G_CALLBACK (action_next), },
+ { "volume", NULL, "", "<control>v", NULL, G_CALLBACK (action_volume), },
};
@@ -139,6 +135,7 @@
/* Interface */
GtkWidget *interface = xfmpc_interface_new ();
+ g_object_set_data (G_OBJECT (window), "XfmpcInterface", interface);
gtk_box_pack_start (GTK_BOX (vbox), interface, FALSE, FALSE, BORDER);
/* Separator */
@@ -157,19 +154,12 @@
GtkUIManager *ui_manager = gtk_ui_manager_new ();
GtkActionGroup *action_group = gtk_action_group_new ("Main");
- gtk_action_group_add_actions (action_group, action_entries_main,
- G_N_ELEMENTS (action_entries_main),
+ gtk_action_group_add_actions (action_group, action_entries,
+ G_N_ELEMENTS (action_entries),
GTK_WIDGET (window));
gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
gtk_ui_manager_add_ui_from_string (ui_manager, main_ui, main_ui_length, NULL);
- action_group = gtk_action_group_new ("XfmpcInterface");
- gtk_action_group_add_actions (action_group, action_entries_xfmpc_interface,
- G_N_ELEMENTS (action_entries_xfmpc_interface),
- XFMPC_INTERFACE (interface));
- gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
- gtk_ui_manager_add_ui_from_string (ui_manager, xfmpc_interface_ui, xfmpc_interface_ui_length, NULL);
-
GtkAccelGroup *accel_group = gtk_ui_manager_get_accel_group (ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
@@ -232,44 +222,49 @@
static void
-action_main_close (GtkAction *action,
- GtkWidget *window)
+action_close (GtkAction *action,
+ GtkWidget *window)
{
cb_window_closed (window, NULL);
}
static void
-action_xfmpc_interface_previous (GtkAction *action,
- XfmpcInterface *interface)
+action_previous (GtkAction *action,
+ GtkWidget *window)
{
+ XfmpcInterface *interface = g_object_get_data (G_OBJECT (window), "XfmpcInterface");
xfmpc_mpdclient_previous (interface->mpdclient);
}
static void
-action_xfmpc_interface_pp (GtkAction *action,
- XfmpcInterface *interface)
+action_pp (GtkAction *action,
+ GtkWidget *window)
{
+ XfmpcInterface *interface = g_object_get_data (G_OBJECT (window), "XfmpcInterface");
xfmpc_interface_pp_clicked (interface);
}
static void
-action_xfmpc_interface_stop (GtkAction *action,
- XfmpcInterface *interface)
+action_stop (GtkAction *action,
+ GtkWidget *window)
{
+ XfmpcInterface *interface = g_object_get_data (G_OBJECT (window), "XfmpcInterface");
xfmpc_mpdclient_stop (interface->mpdclient);
}
static void
-action_xfmpc_interface_next (GtkAction *action,
- XfmpcInterface *interface)
+action_next (GtkAction *action,
+ GtkWidget *window)
{
+ XfmpcInterface *interface = g_object_get_data (G_OBJECT (window), "XfmpcInterface");
xfmpc_mpdclient_next (interface->mpdclient);
}
static void
-action_xfmpc_interface_volume (GtkAction *action,
- XfmpcInterface *interface)
+action_volume (GtkAction *action,
+ GtkWidget *window)
{
+ XfmpcInterface *interface = g_object_get_data (G_OBJECT (window), "XfmpcInterface");
xfmpc_interface_popup_volume (interface);
}
Modified: xfmpc/trunk/src/mpdclient.c
===================================================================
--- xfmpc/trunk/src/mpdclient.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/mpdclient.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
* 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
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -26,7 +26,7 @@
#include "mpdclient.h"
#include "preferences.h"
-#define XFMPC_MPDCLIENT_GET_PRIVATE(o) \
+#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFMPC_TYPE_MPDCLIENT, XfmpcMpdclientPrivate))
@@ -46,7 +46,7 @@
LAST_SIGNAL
};
-static guint xfmpc_mpdclient_signals[LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
@@ -56,12 +56,13 @@
static void xfmpc_mpdclient_initenv (XfmpcMpdclient *mpdclient);
-static void cb_xfmpc_mpdclient_status_changed (MpdObj *mi,
+static void cb_status_changed (MpdObj *mi,
ChangedStatusType what,
gpointer user_data);
static gchar * _get_formatted_name (mpd_Song *song);
+
struct _XfmpcMpdclientClass
{
GObjectClass parent_class;
@@ -81,6 +82,7 @@
struct _XfmpcMpdclient
{
GObject parent;
+ /*<private>*/
XfmpcMpdclientPrivate *priv;
};
@@ -139,7 +141,7 @@
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = xfmpc_mpdclient_finalize;
- xfmpc_mpdclient_signals[SIG_CONNECTED] =
+ signals[SIG_CONNECTED] =
g_signal_new ("connected", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, connected),
@@ -147,7 +149,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- xfmpc_mpdclient_signals[SIG_SONG_CHANGED] =
+ signals[SIG_SONG_CHANGED] =
g_signal_new ("song-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, song_changed),
@@ -155,7 +157,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- xfmpc_mpdclient_signals[SIG_PP_CHANGED] =
+ signals[SIG_PP_CHANGED] =
g_signal_new ("pp-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, pp_changed),
@@ -164,7 +166,7 @@
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
- xfmpc_mpdclient_signals[SIG_TIME_CHANGED] =
+ signals[SIG_TIME_CHANGED] =
g_signal_new ("time-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, time_changed),
@@ -174,7 +176,7 @@
G_TYPE_INT,
G_TYPE_INT);
- xfmpc_mpdclient_signals[SIG_VOLUME_CHANGED] =
+ signals[SIG_VOLUME_CHANGED] =
g_signal_new ("volume-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, volume_changed),
@@ -183,7 +185,7 @@
G_TYPE_NONE, 1,
G_TYPE_INT);
- xfmpc_mpdclient_signals[SIG_STOPPED] =
+ signals[SIG_STOPPED] =
g_signal_new ("stopped", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, stopped),
@@ -191,7 +193,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- xfmpc_mpdclient_signals[SIG_DATABASE_CHANGED] =
+ signals[SIG_DATABASE_CHANGED] =
g_signal_new ("database-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, database_changed),
@@ -199,7 +201,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- xfmpc_mpdclient_signals[SIG_PLAYLIST_CHANGED] =
+ signals[SIG_PLAYLIST_CHANGED] =
g_signal_new ("playlist-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, playlist_changed),
@@ -207,7 +209,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- xfmpc_mpdclient_signals[SIG_REPEAT] =
+ signals[SIG_REPEAT] =
g_signal_new ("repeat", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, repeat),
@@ -216,7 +218,7 @@
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
- xfmpc_mpdclient_signals[SIG_RANDOM] =
+ signals[SIG_RANDOM] =
g_signal_new ("random", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST|G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfmpcMpdclientClass, random),
@@ -229,17 +231,16 @@
static void
xfmpc_mpdclient_init (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = mpdclient->priv = GET_PRIVATE (mpdclient);
priv->mi = mpd_new_default ();
- mpd_signal_connect_status_changed (priv->mi, (StatusChangedCallback)cb_xfmpc_mpdclient_status_changed, mpdclient);
+ mpd_signal_connect_status_changed (priv->mi, (StatusChangedCallback)cb_status_changed, mpdclient);
}
static void
xfmpc_mpdclient_finalize (GObject *object)
{
XfmpcMpdclient *mpdclient = XFMPC_MPDCLIENT (object);
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
mpd_free (priv->mi);
(*G_OBJECT_CLASS (parent_class)->finalize) (object);
@@ -266,10 +267,8 @@
static void
xfmpc_mpdclient_initenv (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
XfmpcPreferences *preferences = xfmpc_preferences_get ();
- gchar *host, *password;
- guint port;
gboolean use_defaults;
g_object_get (preferences, "mpd-use-defaults", &use_defaults, NULL);
@@ -318,7 +317,7 @@
gboolean
xfmpc_mpdclient_connect (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (xfmpc_mpdclient_is_connected (mpdclient))
return TRUE;
@@ -333,7 +332,7 @@
mpd_send_password (priv->mi);
- g_signal_emit_by_name (mpdclient, "connected");
+ g_signal_emit (mpdclient, signals[SIG_CONNECTED], 0);
return TRUE;
}
@@ -341,7 +340,7 @@
void
xfmpc_mpdclient_disconnect (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (xfmpc_mpdclient_is_connected (mpdclient))
mpd_disconnect (priv->mi);
@@ -350,7 +349,7 @@
gboolean
xfmpc_mpdclient_is_connected (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_check_connected (priv->mi);
}
@@ -358,7 +357,7 @@
gboolean
xfmpc_mpdclient_previous (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_player_prev (priv->mi) != MPD_OK)
return FALSE;
@@ -378,7 +377,7 @@
gboolean
xfmpc_mpdclient_play (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_player_play (priv->mi) != MPD_OK)
return FALSE;
@@ -389,7 +388,7 @@
gboolean
xfmpc_mpdclient_pause (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_player_pause (priv->mi) != MPD_OK)
return FALSE;
@@ -400,7 +399,7 @@
gboolean
xfmpc_mpdclient_stop (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_player_stop (priv->mi) != MPD_OK)
return FALSE;
@@ -411,7 +410,7 @@
gboolean
xfmpc_mpdclient_next (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_player_next (priv->mi) != MPD_OK)
return FALSE;
@@ -423,7 +422,7 @@
xfmpc_mpdclient_set_id (XfmpcMpdclient *mpdclient,
gint id)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_player_play_id (priv->mi, id) == MPD_OK ? TRUE : FALSE;
}
@@ -432,7 +431,7 @@
xfmpc_mpdclient_set_song_time (XfmpcMpdclient *mpdclient,
guint time)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_player_seek (priv->mi, time) != MPD_OK)
return FALSE;
@@ -444,7 +443,7 @@
xfmpc_mpdclient_set_volume (XfmpcMpdclient *mpdclient,
guint8 volume)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_status_set_volume (priv->mi, volume) < 0)
return FALSE;
@@ -456,7 +455,7 @@
xfmpc_mpdclient_set_repeat (XfmpcMpdclient *mpdclient,
gboolean repeat)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (MPD_OK != mpd_player_set_repeat (priv->mi, repeat))
return FALSE;
@@ -468,7 +467,7 @@
xfmpc_mpdclient_set_random (XfmpcMpdclient *mpdclient,
gboolean random)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (MPD_OK != mpd_player_set_random (priv->mi, random))
return FALSE;
@@ -481,7 +480,7 @@
gint
xfmpc_mpdclient_get_pos (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
gint pos = mpd_player_get_current_song_pos (priv->mi);
if (pos < 0)
@@ -493,7 +492,7 @@
gint
xfmpc_mpdclient_get_id (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_player_get_current_song_id (priv->mi);
}
@@ -501,7 +500,7 @@
const gchar *
xfmpc_mpdclient_get_artist (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
mpd_Song *song = mpd_playlist_get_current_song (priv->mi);
if (G_UNLIKELY (NULL == song))
@@ -516,7 +515,7 @@
const gchar *
xfmpc_mpdclient_get_title (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
mpd_Song *song = mpd_playlist_get_current_song (priv->mi);
if (G_UNLIKELY (NULL == song))
@@ -531,7 +530,7 @@
const gchar *
xfmpc_mpdclient_get_album (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
mpd_Song *song = mpd_playlist_get_current_song (priv->mi);
if (G_UNLIKELY (NULL == song))
@@ -546,7 +545,7 @@
const gchar *
xfmpc_mpdclient_get_date (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
mpd_Song *song = mpd_playlist_get_current_song (priv->mi);
if (G_UNLIKELY (NULL == song))
@@ -561,24 +560,21 @@
gint
xfmpc_mpdclient_get_time (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_status_get_elapsed_song_time (priv->mi);
}
gint
xfmpc_mpdclient_get_total_time (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_status_get_total_song_time (priv->mi);
}
guint8
xfmpc_mpdclient_get_volume (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
gint volume = mpd_status_get_volume (priv->mi);
return (volume < 0) ? 100 : volume;
}
@@ -586,32 +582,28 @@
gboolean
xfmpc_mpdclient_get_repeat (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_player_get_repeat (priv->mi);
}
gboolean
xfmpc_mpdclient_get_random (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_player_get_random (priv->mi);
}
gboolean
xfmpc_mpdclient_is_playing (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_player_get_state (priv->mi) == MPD_PLAYER_PLAY;
}
gboolean
xfmpc_mpdclient_is_stopped (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
return mpd_player_get_state (priv->mi) == MPD_PLAYER_STOP;
}
@@ -620,54 +612,53 @@
void
xfmpc_mpdclient_update_status (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
-
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
mpd_status_update (priv->mi);
}
static void
-cb_xfmpc_mpdclient_status_changed (MpdObj *mi,
- ChangedStatusType what,
- gpointer user_data)
+cb_status_changed (MpdObj *mi,
+ ChangedStatusType what,
+ gpointer user_data)
{
XfmpcMpdclient *mpdclient = XFMPC_MPDCLIENT (user_data);
g_return_if_fail (G_LIKELY (NULL != user_data));
if (what & MPD_CST_DATABASE)
- g_signal_emit_by_name (mpdclient, "database-changed");
+ g_signal_emit (mpdclient, signals[SIG_DATABASE_CHANGED], 0);
if (what & MPD_CST_PLAYLIST)
- g_signal_emit_by_name (mpdclient, "playlist-changed");
+ g_signal_emit (mpdclient, signals[SIG_PLAYLIST_CHANGED], 0);
if (what & MPD_CST_SONGID && !(what & MPD_CST_DATABASE))
- g_signal_emit_by_name (mpdclient, "song-changed");
+ g_signal_emit (mpdclient, signals[SIG_SONG_CHANGED], 0);
if (what & MPD_CST_STATE)
{
gint state = mpd_player_get_state (mi);
if (state == MPD_PLAYER_STOP)
- g_signal_emit_by_name (mpdclient, "stopped");
+ g_signal_emit (mpdclient, signals[SIG_STOPPED], 0);
else if (state == MPD_PLAYER_PLAY || state == MPD_PLAYER_PAUSE)
- g_signal_emit_by_name (mpdclient, "pp-changed",
- state == MPD_PLAYER_PLAY);
+ g_signal_emit (mpdclient, signals[SIG_PP_CHANGED], 0,
+ state == MPD_PLAYER_PLAY);
}
if (what & MPD_CST_VOLUME)
- g_signal_emit_by_name (mpdclient, "volume-changed",
- xfmpc_mpdclient_get_volume (mpdclient));
+ g_signal_emit (mpdclient, signals[SIG_VOLUME_CHANGED], 0,
+ xfmpc_mpdclient_get_volume (mpdclient));
if (what & (MPD_CST_ELAPSED_TIME|MPD_CST_TOTAL_TIME))
- g_signal_emit_by_name (mpdclient, "time-changed",
- xfmpc_mpdclient_get_time (mpdclient),
- xfmpc_mpdclient_get_total_time (mpdclient));
+ g_signal_emit (mpdclient, signals[SIG_TIME_CHANGED], 0,
+ xfmpc_mpdclient_get_time (mpdclient),
+ xfmpc_mpdclient_get_total_time (mpdclient));
if (what & MPD_CST_REPEAT)
- g_signal_emit_by_name (mpdclient, "repeat",
- xfmpc_mpdclient_get_repeat (mpdclient));
+ g_signal_emit (mpdclient, signals[SIG_REPEAT], 0,
+ xfmpc_mpdclient_get_repeat (mpdclient));
if (what & MPD_CST_RANDOM)
- g_signal_emit_by_name (mpdclient, "random",
- xfmpc_mpdclient_get_random (mpdclient));
+ g_signal_emit (mpdclient, signals[SIG_RANDOM], 0,
+ xfmpc_mpdclient_get_random (mpdclient));
}
@@ -675,7 +666,7 @@
gboolean
xfmpc_mpdclient_queue_commit (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_playlist_queue_commit (priv->mi) != MPD_OK)
return FALSE;
@@ -687,7 +678,7 @@
xfmpc_mpdclient_queue_add (XfmpcMpdclient *mpdclient,
const gchar *path)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_playlist_queue_add (priv->mi, (gchar *)path) != MPD_OK)
return FALSE;
@@ -699,7 +690,7 @@
xfmpc_mpdclient_queue_remove_id (XfmpcMpdclient *mpdclient,
gint id)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_playlist_queue_delete_id (priv->mi, id) != MPD_OK)
return FALSE;
@@ -713,7 +704,12 @@
gint id;
while (xfmpc_mpdclient_playlist_read (mpdclient, &id, NULL, NULL))
- xfmpc_mpdclient_queue_remove_id (mpdclient, id);
+ {
+ if (!xfmpc_mpdclient_queue_remove_id (mpdclient, id))
+ return FALSE;
+ }
+
+ return TRUE;
}
@@ -725,7 +721,7 @@
gchar **length)
{
static MpdData *data = NULL;
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (NULL == data)
data = mpd_playlist_get_changes (priv->mi, -1);
@@ -747,7 +743,7 @@
gboolean
xfmpc_mpdclient_playlist_clear (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_playlist_clear (priv->mi) != FALSE)
return FALSE;
@@ -758,7 +754,7 @@
gboolean
xfmpc_mpdclient_database_refresh (XfmpcMpdclient *mpdclient)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
if (mpd_database_update_dir (priv->mi, "/") != MPD_OK)
return FALSE;
@@ -773,7 +769,7 @@
gchar **basename,
gboolean *is_dir)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
static MpdData *data = NULL;
if (NULL == data)
@@ -820,7 +816,7 @@
gchar **filename,
gchar **basename)
{
- XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT_GET_PRIVATE (mpdclient);
+ XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
static MpdData *data = NULL;
gchar **queries;
gint i;
Modified: xfmpc/trunk/src/mpdclient.h
===================================================================
--- xfmpc/trunk/src/mpdclient.h 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/mpdclient.h 2009-02-03 20:38:26 UTC (rev 6638)
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __XFMPC_MPDCLIENT_H__
@@ -68,7 +68,7 @@
gint xfmpc_mpdclient_get_total_time (XfmpcMpdclient *mpdclient);
guint8 xfmpc_mpdclient_get_volume (XfmpcMpdclient *mpdclient);
gboolean xfmpc_mpdclient_get_repeat (XfmpcMpdclient *mpdclient);
-gboolean xfmpc_mpdclient_get_repeat (XfmpcMpdclient *mpdclient);
+gboolean xfmpc_mpdclient_get_random (XfmpcMpdclient *mpdclient);
gboolean xfmpc_mpdclient_is_playing (XfmpcMpdclient *mpdclient);
gboolean xfmpc_mpdclient_is_stopped (XfmpcMpdclient *mpdclient);
Modified: xfmpc/trunk/src/playlist.c
===================================================================
--- xfmpc/trunk/src/playlist.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/playlist.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
* 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
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
#define BORDER 4
-#define XFMPC_PLAYLIST_GET_PRIVATE(o) \
+#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), XFMPC_TYPE_PLAYLIST, XfmpcPlaylistPrivate))
@@ -81,22 +81,23 @@
struct _XfmpcPlaylist
{
- GtkVBox parent;
- XfmpcPlaylistPrivate *priv;
- XfmpcPreferences *preferences;
- XfmpcMpdclient *mpdclient;
+ GtkVBox parent;
+ XfmpcPreferences *preferences;
+ XfmpcMpdclient *mpdclient;
+ /*<private>*/
+ XfmpcPlaylistPrivate *priv;
};
struct _XfmpcPlaylistPrivate
{
- GtkWidget *treeview;
- GtkTreeModelFilter *filter;
- GtkListStore *store;
- GtkWidget *filter_entry;
- GtkWidget *menu;
+ GtkWidget *treeview;
+ GtkTreeModelFilter *filter;
+ GtkListStore *store;
+ GtkWidget *filter_entry;
+ GtkWidget *menu;
- gint current;
- gboolean autocenter;
+ gint current;
+ gboolean autocenter;
};
@@ -150,7 +151,7 @@
static void
xfmpc_playlist_init (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = playlist->priv = GET_PRIVATE (playlist);
playlist->preferences = xfmpc_preferences_get ();
playlist->mpdclient = xfmpc_mpdclient_get ();
@@ -285,7 +286,7 @@
gchar *song,
gchar *length)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
GtkTreeIter iter;
gtk_list_store_append (priv->store, &iter);
@@ -300,15 +301,14 @@
void
xfmpc_playlist_clear (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
-
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
gtk_list_store_clear (priv->store);
}
void
xfmpc_playlist_delete_selection (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
GtkTreeModel *store = GTK_TREE_MODEL (priv->store);
GtkTreeIter iter;
GList *list;
@@ -338,7 +338,7 @@
xfmpc_playlist_select_row (XfmpcPlaylist *playlist,
gint i)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->filter), NULL) == 0)
return;
@@ -352,7 +352,7 @@
void
xfmpc_playlist_refresh_current_song (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
/* Remove the bold from the "last" current song */
GtkTreeIter iter;
@@ -376,7 +376,7 @@
static void
cb_song_changed (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
xfmpc_playlist_refresh_current_song (playlist);
@@ -388,7 +388,7 @@
static void
cb_playlist_changed (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
gchar *song, *length;
gint id, current;
@@ -414,7 +414,7 @@
GtkTreePath *path,
GtkTreeViewColumn *column)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
GtkTreeIter iter;
gint id;
@@ -451,7 +451,7 @@
cb_button_pressed (XfmpcPlaylist *playlist,
GdkEventButton *event)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
GtkTreeSelection *selection;
GtkTreePath *path;
@@ -480,15 +480,13 @@
cb_popup_menu (XfmpcPlaylist *playlist)
{
popup_menu (playlist);
-
return TRUE;
}
static void
popup_menu (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
-
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
gtk_menu_popup (GTK_MENU (priv->menu),
NULL, NULL,
NULL, NULL,
@@ -501,7 +499,7 @@
static void
cb_filter_entry_activated (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
GtkTreeModel *model = GTK_TREE_MODEL (priv->filter);
GList *list;
@@ -521,7 +519,7 @@
cb_filter_entry_key_released (XfmpcPlaylist *playlist,
GdkEventKey *event)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
if (event->type != GDK_KEY_RELEASE)
return FALSE;
@@ -546,8 +544,7 @@
static void
cb_filter_entry_changed (XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
-
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
gtk_tree_model_filter_refilter (priv->filter);
}
@@ -556,7 +553,7 @@
GtkTreeIter *iter,
XfmpcPlaylist *playlist)
{
- XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST_GET_PRIVATE (playlist);
+ XfmpcPlaylistPrivate *priv = XFMPC_PLAYLIST (playlist)->priv;
gchar *song, *song_tmp;
gchar *search;
gboolean result = TRUE;
Modified: xfmpc/trunk/src/playlist.h
===================================================================
--- xfmpc/trunk/src/playlist.h 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/playlist.h 2009-02-03 20:38:26 UTC (rev 6638)
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __XFMPC_PLAYLIST_H__
Modified: xfmpc/trunk/src/preferences.c
===================================================================
--- xfmpc/trunk/src/preferences.c 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/preferences.c 2009-02-03 20:38:26 UTC (rev 6638)
@@ -1,6 +1,9 @@
/*
- * Copyright (c) 2008 Mike Massonnet <mmassonnet at xfce.org>
+ * Copyright (c) 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
*
+ * Based on ThunarPreferences:
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
+ *
* 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
@@ -9,11 +12,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -76,6 +79,7 @@
struct _XfmpcPreferences
{
GObject parent;
+ /*<private>*/
GValue values[N_PROPERTIES];
};
Modified: xfmpc/trunk/src/preferences.h
===================================================================
--- xfmpc/trunk/src/preferences.h 2009-02-03 20:36:31 UTC (rev 6637)
+++ xfmpc/trunk/src/preferences.h 2009-02-03 20:38:26 UTC (rev 6638)
@@ -9,11 +9,11 @@
* 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 Library General Public License for more details.
+ * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __XFMPC_PREFERENCES_H__
More information about the Goodies-commits
mailing list