From 00056c3ee8a0a64bd90637ffdcc04a2f415bbb9a Mon Sep 17 00:00:00 2001 From: Duilio Protti Date: Sat, 25 Jun 2016 17:36:39 -0300 Subject: [PATCH] Removed DBUS dep --- ChangeLog | 3 +++ README.md | 8 ++++++-- configure.ac | 4 ---- src/Makefile.am | 4 ++-- src/renderer.cc | 15 --------------- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e04c05..e24c639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + +THIS FILE IS NOT MAINTAINED. KEPT AS HISTORICAL RECORD. + 2013-10-18 Duilio Protti * Repository moved to Github diff --git a/README.md b/README.md index 7d245db..3caa1ab 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,15 @@ Requirements ------------ - Audacious >= 3.5 -- Audclient >= 3.5 (Audacious D-BUS remote control library) +- Audclient >= 3.5 (Audacious remote control library) - 1.0.6 <= SDL < 2 - Glib >= 2.8 - Gtk+ >= 2.8 +*** Install deps in Ubuntu *** + +sudo apt -y install audacious-dev libaudclient-dev libsdl1.2-dev libglib2.0-dev libgtk2.0-dev + Install ------- @@ -30,7 +34,7 @@ Run - mark Infinity - play your favorite songs -To enter/leave Full-Screen mode press Tab key. +Enter / leave full-screen by pressing Tab. ![Screenshot of Infinity Settings](../screenshots/screenshot-settings.png?raw=true "Infinity Settings") diff --git a/configure.ac b/configure.ac index 3644e09..14a541c 100644 --- a/configure.ac +++ b/configure.ac @@ -37,10 +37,6 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8,,) AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS) -PKG_CHECK_MODULES(DBUSGLIB1, dbus-glib-1 >= 0.92,,) -AC_SUBST(DBUSGLIB1_LIBS) -AC_SUBST(DBUSGLIB1_CFLAGS) - PKG_CHECK_MODULES(AUDACIOUS, audacious >= 3.5,,) AC_SUBST(AUDACIOUS_LIBS) AC_SUBST(AUDACIOUS_CFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index a5cefaf..5265323 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,13 +11,13 @@ localedir = $(infinity_datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ COMMON_FLAGS = @AUDACIOUS_CFLAGS@ @AUDCLIENT_CFLAGS@ @SDL_CFLAGS@ @GTK_CFLAGS@\ - @GLIB_CFLAGS@ @DBUSGLIB1_CFLAGS@ $(INF_CFLAGS_EXTRA) -DDATADIR='"$(datadir)"' + @GLIB_CFLAGS@ $(INF_CFLAGS_EXTRA) -DDATADIR='"$(datadir)"' AM_CFLAGS = @CFLAGS@ $(COMMON_FLAGS) AM_CXXFLAGS = @CXXFLAGS@ $(COMMON_FLAGS) libinfinite_la_LDFLAGS = ${CXX} -libinfinite_la_LIBADD = @AUDACIOUS_LIBS@ @AUDCLIENT_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @DBUSGLIB1_LIBS@ +libinfinite_la_LIBADD = @AUDACIOUS_LIBS@ @AUDCLIENT_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ libinfinite_la_SOURCES = \ main.cc \ renderer.cc renderer.h\ diff --git a/src/renderer.cc b/src/renderer.cc index 238b9ce..d66a0e7 100644 --- a/src/renderer.cc +++ b/src/renderer.cc @@ -18,17 +18,12 @@ #include #include #include -#include #include #include #include #include -#include -#include - - #include #include /*#include */ @@ -72,9 +67,6 @@ static GTimer *title_timer; static SDL_Thread *thread; -static DBusGConnection *connection = NULL; -static DBusGProxy *dbus_proxy = NULL; - static gint32 event_filter(const SDL_Event *event); static void check_events(); static int renderer(void *); @@ -85,7 +77,6 @@ static void set_title(void); void renderer_init(void) { - GError *error = NULL; gint32 _try; if (initializing) { @@ -122,11 +113,6 @@ void renderer_init(void) g_timer_start(title_timer); display_load_random_effect(¤t_effect); - connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE, - AUDACIOUS_DBUS_PATH, - AUDACIOUS_DBUS_INTERFACE); - (void)SDL_EventState((Uint8)SDL_ALLEVENTS, SDL_IGNORE); (void)SDL_EventState((Uint8)SDL_VIDEORESIZE, SDL_ENABLE); (void)SDL_EventState((Uint8)SDL_ACTIVEEVENT, SDL_ENABLE); @@ -176,7 +162,6 @@ void renderer_finish(void) g_usleep(10000 * SDL_TIMESLICE); display_quit(); g_timer_destroy(title_timer); - g_object_unref(dbus_proxy); plugin = aud_plugin_lookup_basename("libinfinite"); aud_plugin_enable(plugin, false);