summaryrefslogtreecommitdiff
path: root/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch
diff options
context:
space:
mode:
Diffstat (limited to '~emulatorman/xchat-xsys-noaudacious/no-audacious.patch')
-rw-r--r--~emulatorman/xchat-xsys-noaudacious/no-audacious.patch244
1 files changed, 0 insertions, 244 deletions
diff --git a/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch b/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch
deleted file mode 100644
index 749234e7a..000000000
--- a/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -uNr xsys-2.2.0.ORIG/Makefile xsys-2.2.0/Makefile
---- xsys-2.2.0.ORIG/Makefile 2008-01-30 11:53:56.000000000 +0000
-+++ xsys-2.2.0/Makefile 2008-01-30 11:59:39.000000000 +0000
-@@ -10,7 +10,6 @@
- VER_PATCH = 0
- CC = gcc
- CFLAGS += -O2 -Wall -fPIC
--CFLAGS += $(shell pkg-config dbus-1 --cflags) $(shell pkg-config glib-2.0 --cflags)
- CFLAGS += -DVER_MINOR=$(VER_MINOR) -DVER_MAJOR=$(VER_MAJOR) -DVER_PATCH=$(VER_PATCH) \
- -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\" -DPCIIDS=\"$(PCIIDS)\" $(BUTTON)
- LDFLAGS = $(CFLAGS) -shared
-@@ -20,7 +19,7 @@
- ALL : $(LIBRARY)
-
- $(LIBRARY) : $(OBJECTS)
-- $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci $(shell pkg-config dbus-1 --libs) $(shell pkg-config glib-2.0 --libs) -laudclient
-+ $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci
-
- xsys.o : xsys.c
- parse.o : parse.c
-diff -uNr xsys-2.2.0.ORIG/parse.h xsys-2.2.0/parse.h
---- xsys-2.2.0.ORIG/parse.h 2008-01-30 11:53:56.000000000 +0000
-+++ xsys-2.2.0/parse.h 2008-01-30 11:58:03.000000000 +0000
-@@ -33,7 +33,6 @@
- int xs_parse_video(char *vid_card);
- int xs_parse_agpbridge(char *agp_bridge);
- int xs_parse_ether(char *ethernet_card);
--int xs_parse_xmms_info(char **title, unsigned int *songtime, unsigned int *playtime);
- int xs_parse_distro(char *name);
- int xs_parse_hwmon_chip(char *chip);
- int xs_parse_hwmon_temp(char *temp, unsigned int *sensor);
-diff -uNr xsys-2.2.0.ORIG/xsys.c xsys-2.2.0/xsys.c
---- xsys-2.2.0.ORIG/xsys.c 2008-01-30 11:53:56.000000000 +0000
-+++ xsys-2.2.0/xsys.c 2008-01-30 12:00:36.000000000 +0000
-@@ -28,24 +28,17 @@
- #include "parse.h"
- #include "match.h"
- #include "xsys.h"
--#include <audacious/dbus.h>
--#include <audacious/audctrl.h>
-
- static xchat_plugin *ph;
-
- static char format[bsize] = "%B%1%B[%2]";
--static char playing[42] = "now_playing";
- unsigned int percentages = 1;
--static unsigned int action = 0;
-
- static void load_config();
- static void save_config();
--static gboolean dbus_init(void);
-
- static int format_cb (char *word[], char *word_eol[], void *userdata);
--static int playing_cb (char *word[], char *word_eol[], void *userdata);
- static int percentages_cb (char *word[], char *word_eol[], void *userdata);
--static int action_cb (char *word[], char *word_eol[], void *userdata);
- static int sysinfo_cb (char *word[], char *word_eol[], void *userdata);
- static int xsys_cb (char *word[], char *word_eol[], void *userdata);
- static int cpuinfo_cb (char *word[], char *word_eol[], void *userdata);
-@@ -62,22 +55,17 @@
- #if 0
- static int hwmon_cb (char *word[], char *word_eol[], void *userdata);
- #endif
--static int np_cb (char *word[], char *word_eol[], void *userdata);
--static DBusGProxy *dbus_proxy = NULL;
--static DBusGConnection *connection = NULL;
-
- int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name,
- char **plugin_desc, char **plugin_version, char *arg)
- {
- ph = plugin_handle;
- *plugin_name = "X-Sys_2";
-- *plugin_desc = "A sysinfo/audacious plugin";
-+ *plugin_desc = "A sysinfo plugin";
- *plugin_version = VER_STRING;
-
- xchat_hook_command(ph, "XSYS2FORMAT",XCHAT_PRI_NORM, format_cb, NULL, NULL);
-- xchat_hook_command(ph, "PLAYING", XCHAT_PRI_NORM, playing_cb, NULL, NULL);
- xchat_hook_command(ph, "PERCENTAGES",XCHAT_PRI_NORM, percentages_cb, NULL, NULL);
-- xchat_hook_command(ph, "NPACTION", XCHAT_PRI_NORM, action_cb, NULL, NULL);
- xchat_hook_command(ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 0);
- xchat_hook_command(ph, "ESYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 1);
- xchat_hook_command(ph, "XSYS", XCHAT_PRI_NORM, xsys_cb, NULL, (void *) 0);
-@@ -108,13 +96,6 @@
- xchat_hook_command(ph, "HWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 0);
- xchat_hook_command(ph, "EHWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 1);
- #endif
-- if (dbus_init())
-- {
-- xchat_hook_command(ph, "NP", XCHAT_PRI_NORM, np_cb, NULL, (void *) 0);
-- xchat_hook_command(ph, "ENP", XCHAT_PRI_NORM, np_cb, NULL, (void *) 1);
-- xchat_printf(ph, "D-Bus MPRIS support initialized", VER_STRING);
-- }
--
- load_config();
-
- xchat_printf(ph, "X-Sys %s Loaded Succesfully", VER_STRING);
-@@ -122,11 +103,6 @@
- return 1;
- }
-
--static void xchat_plugin_deinit()
--{
-- /* blahblahblah */
--}
--
- static void save_config()
- {
- FILE *fp;
-@@ -139,9 +115,7 @@
- return;
- }
- fprintf(fp, "format: %s\n", format);
-- fprintf(fp, "playing: %s\n", playing);
- fprintf(fp, "percentages: %i\n", percentages);
-- fprintf(fp, "action: %i\n", action);
- fclose(fp);
- return;
- }
-@@ -158,30 +132,11 @@
- while(fgets(buffer, bsize, fp) != NULL)
- {
- find_match_char(buffer, "format", format);
-- find_match_char(buffer, "playing", playing);
- find_match_int(buffer, "percentages", &percentages);
-- find_match_int(buffer, "action", &action);
- }
- fclose(fp);
- }
-
--static gboolean dbus_init(void)
--{
-- GError *error = NULL;
--
-- connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-- if (connection == NULL)
-- return FALSE;
--
-- dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE,
-- AUDACIOUS_DBUS_PATH,
-- AUDACIOUS_DBUS_INTERFACE);
-- if (dbus_proxy == NULL)
-- return FALSE;
--
-- return TRUE;
--}
--
- static int format_cb(char *word[], char *word_eol[], void *userdata)
- {
- if(*(word[2]) == '\0')
-@@ -194,18 +149,6 @@
- return XCHAT_EAT_ALL;
- }
-
--static int playing_cb(char *word[], char *word_eol[], void *userdata)
--{
-- if(*(word[2]) == '\0')
-- xchat_printf(ph, "Current playing string:\n%s", playing);
-- else
-- {
-- strncpy(playing, word_eol[2], 42);
-- save_config();
-- }
-- return XCHAT_EAT_ALL;
--}
--
- static int percentages_cb(char *word[], char *word_eol[], void *userdata)
- {
- if(*(word[2]) == '\0')
-@@ -221,21 +164,6 @@
- return XCHAT_EAT_ALL;
- }
-
--static int action_cb(char *word[], char *word_eol[], void *userdata)
--{
-- if(*(word[2]) == '\0')
-- if (action != 0)
-- xchat_printf(ph, "Now playing action currently enabled");
-- else
-- xchat_printf(ph, "Now playing action currently disabled");
-- else
-- {
-- action = atoi(word[2]);
-- save_config();
-- }
-- return XCHAT_EAT_ALL;
--}
--
- static int sysinfo_cb(char *word[], char *word_eol[], void *userdata)
- {
- char sysinfo[bsize], buffer[bsize], cpu_model[bsize], cpu_cache[bsize], cpu_vendor[bsize];
-@@ -683,52 +611,3 @@
- return XCHAT_EAT_ALL;
- }
- #endif
--
--static int np_cb(char *word[], char *word_eol[], void *userdata)
--{
-- char *buffer = NULL, title[bsize], length[42];
-- int pos, len, p = audacious_remote_get_playlist_pos(dbus_proxy);
--
-- if (!audacious_remote_is_running(dbus_proxy))
-- {
-- xchat_printf(ph, "Audacious is not currently running");
-- return XCHAT_EAT_ALL;
-- }
--
-- pos = audacious_remote_get_output_time(dbus_proxy);
-- len = audacious_remote_get_playlist_time(dbus_proxy, p);
-- buffer = decruft_filename(audacious_remote_get_playlist_title(dbus_proxy, p));
--
-- strncpy(title, buffer, bsize);
--
-- if (action != 0)
-- flat_format_output(playing, title, format);
-- else
-- format_output(playing, title, format);
-- strcat(title, "\017 ");
--
-- if(len == -1)
-- snprintf(length, 42, "%d:%02d/stream",
-- ((pos/1000)-((pos/1000)%60))/60, (pos/1000)%60);
-- else
-- snprintf(length, 42, "%d:%02d/%d:%02d",
-- ((pos/1000)-((pos/1000)%60))/60, (pos/1000)%60,
-- ((len/1000)-((len/1000)%60))/60, (len/1000)%60);
--
-- if (action != 0)
-- flat_format_output("length", length, format);
-- else
-- format_output("length", length, format);
-- strncat(title, length, bsize);
--
-- if ((action != 0) && (long)userdata)
-- xchat_printf(ph, "You are %s", title);
-- else if (action != 0)
-- xchat_commandf(ph, "me is %s", title);
-- else if ((long)userdata)
-- xchat_printf(ph, "%s", title);
-- else
-- xchat_commandf(ph, "say %s", title);
--
-- return XCHAT_EAT_ALL;
--}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-17 08:59:47 +0000