pidgin-audacious: pidgin-audacious.c comparison

comparison pidgin-audacious.c @ 21:83002f858ee9

- do not retract current song if playing has been paused. - little bit cleanup.

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Sun, 05 Oct 2008 14:19:55 +0900
parents	4aa711530489
children	fbad40babe88

comparison

equal deleted inserted replaced

-:4aa711530489
+:83002f858ee9
 #include "cmds.h"
 #include "savedstatuses.h"
 #define PIDGINAUD_PLUGIN_ID     "pidgin_audacious"
 #define PLUGIN_NAME             "Pidgin-Audacious"
+/* preferences */
 #define OPT_PIDGINAUD           "/plugins/pidgin_audacious"
 #define OPT_PROCESS_STATUS      OPT_PIDGINAUD "/process_status"
 #define OPT_PROCESS_USERINFO    OPT_PIDGINAUD "/process_userinfo"
 #define OPT_SONG_TEMPLATE       OPT_PIDGINAUD "/song_template"
 #define OPT_PASTE_TEMPLATE      OPT_PIDGINAUD "/paste_template"
 #define OPT_LOG_OUTPUT          OPT_PIDGINAUD "/log_output"
 #define OPT_PLAYER              OPT_PIDGINAUD "/player"
+/* templates */
+#define TITLE   "%title"
+#define ARTIST  "%artist"
+#define ALBUM   "%album"
+#define GENRE   "%genre"
 #define DEFAULT_SONG_TEMPLATE   "%title - %artist"
 #define DEFAULT_PLAYER          "audacious"
 #define SONG_TOKEN              "%song"
 #define NO_SONG_MESSAGE         "No song being played."
-#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+/* constants */
+#define DBUS_TIMEOUT 1000
-#define aud_debug(fmt, ...)	do { if(purple_prefs_get_bool(OPT_LOG_OUTPUT)) purple_debug(PURPLE_DEBUG_INFO, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__); } while(0);
+#define PLAYING 0
+#define PAUSED  1
-#define aud_error(fmt, ...)	do { if(purple_prefs_get_bool(OPT_LOG_OUTPUT)) purple_debug(PURPLE_DEBUG_ERROR, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__); } while(0);
+#define STOPPED 2
-/* xxx move up */
+/* custom data type */
-#define TITLE   "%title"
-#define ARTIST  "%artist"
-#define ALBUM   "%album"
-#define GENRE   "%genre"
 typedef struct song_tuple {
 gchar *title;
 gchar *artist;
 gchar *album;
 gchar *genre;
 } song_tuple;
+/* mpris data containers */
+#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+/* debug macros */
+#define aud_debug(fmt, ...)	do { if(purple_prefs_get_bool(OPT_LOG_OUTPUT)) purple_debug(PURPLE_DEBUG_INFO, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__); } while(0);
+#define aud_error(fmt, ...)	do { if(purple_prefs_get_bool(OPT_LOG_OUTPUT)) purple_debug(PURPLE_DEBUG_ERROR, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__); } while(0);
 /* globals */
 static GHashTable *seed_status;
 static GHashTable *seed_userinfo;
 static GHashTable *pushed_status;
 static void signed_on_cb(PurpleConnection *gc, void *data);
 static void prefs_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data);
 /* implementation */
 static DBusGProxy *
 get_dbus_session(void)
 {
 GError *error = NULL;
 DBusGProxy *proxy;
 static void
 status_signal_cb(DBusGProxy *player_proxy, gint status, gpointer data)
 {
 	aud_debug("StatusChange %d\n", status);
-	if (status != 0) {
+switch(status) {
+case STOPPED:
+/* clear status/user info */
 		aud_process(NULL);
 /* clear current song */
 purple_util_set_current_song(NULL, NULL, NULL);
+break;
-	}
+case PLAYING:
+case PAUSED:
+default:
+break;
+}
 }
 static void
 aud_process_status(PurpleConnection *gc, gchar *aud_info)
 g_free(song);
 return PURPLE_CMD_RET_OK;
 }
-#define DBUS_TIMEOUT 1000
-#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
-#define PLAYING 0
-#define PAUSED  1
-#define STOPPED 2
 static gboolean
 is_app_playing(void)
 {
+GError *error = NULL;
+int status = STOPPED;
 	gchar *player_name = g_strconcat("org.mpris.",
 purple_prefs_get_string(OPT_PLAYER),
 NULL);
 aud_debug("player_name = %s\n", player_name);
 if(!session) {
 session = get_dbus_session();
 connect_dbus_signals();
 aud_debug("session == NULL. new session = %p\n", session);
 }
 /* audacious only supports this form */
-GError *error = NULL;
-int status = STOPPED;
 gboolean result =
 dbus_g_proxy_call_with_timeout(
 session,
 "GetStatus",
 DBUS_TIMEOUT,
 G_TYPE_INT,
 &status,
 G_TYPE_INVALID);
 aud_debug("GetStatus result = %d\n", result);
+aud_debug("GetStatus status = %d\n", status);
-if(status == PLAYING || status == PAUSED)
+switch(status) {
+case PLAYING:
+case PAUSED:
 return TRUE;
-else
+break;
+case STOPPED:
+default:
 return FALSE;
+break;
-aud_debug("GetStatus status = %d\n", status);
+}
+#if 0
 /* mpris specification 1.0 insists this is the way. no player
 * supports this at this time. --yaz */
-#if 0
 GError *error = NULL;
 GValueArray *s;
 gboolean result =
 dbus_g_proxy_call_with_timeout(
 session,
 int status = g_value_get_int(val);
 g_value_array_free(s);
 aud_debug("status = %d\n", status);
-if(status == STOPPED)
+switch(status) {
+case PLAYING:
+case PAUSED:
+return TRUE;
+break;
+case STOPPED:
+default:
 return FALSE;
-else
-return TRUE;
 }
 	return FALSE;
 #endif
 }
 static void
 signed_on_cb(PurpleConnection *gc, void *data)
 {
 connect_dbus_signals();
 /* connect to purple signals */
 connect_purple_signals(plugin);
+/* clear status */
 	status_signal_cb(NULL, -1, NULL);
 /* register /song command */
 cmdid_paste_current_song =
 purple_cmd_register("song", "", PURPLE_CMD_P_DEFAULT,
 PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT,

Mercurial > pidgin-audacious

comparison pidgin-audacious.c @ 21:83002f858ee9