themusicgod1
/
evacuated-infinity-plugin
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

Removed DBUS dep

This commit is contained in:
Duilio Protti 2016-06-25 17:36:39 -03:00
parent 8703fda5e6
commit 00056c3ee8
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
THIS FILE IS NOT MAINTAINED. KEPT AS HISTORICAL RECORD.
2013-10-18 Duilio Protti <dprotti@users.sourceforge.net>
* Repository moved to Github

8
README.md
View File

@ -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")

4
configure.ac
View File

@ -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)

4
src/Makefile.am
View File

@ -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\

15
src/renderer.cc
View File

@ -18,17 +18,12 @@
#include <unistd.h>
#include <glib.h>
#include <gtk/gtk.h>
#include <dbus/dbus.h>
#include <libaudcore/drct.h>
#include <libaudcore/playlist.h>
#include <libaudcore/plugins.h>
#include <libaudcore/runtime.h>
#include <audacious/audctrl.h>
#include <audacious/dbus.h>
#include <SDL/SDL.h>
#include <SDL/SDL_thread.h>
/*#include <SDL/SDL_syswm.h>*/
@ -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(&current_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);