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

various little improvements

This commit is contained in:
Jeff Cliff 2021-09-25 17:13:51 -06:00
parent a8273c1136
commit 9d2af3eefd
7 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -5,10 +5,9 @@ Music visualization plugin for [Audacious](http://audacious-media-player.org/),
Original infinity by dprotti
It generates beautiful light effects. Supports full-screen mode, mouse resizing, preferences
saving and player control through keyboard.
It generates beautiful light effects. Supports full-screen mode, mouse resizing, preferences saving and player control through keyboard.
![Screenshot of Infinity](https://a.fsdn.com/con/app/proj/infinity-plugin/screenshots/Infinity.png)
![Screenshot of Infinity](Infinity.png)
Requirements
------------
@ -32,9 +31,17 @@ Install from repo
-------
- git clone https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin
- ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu
- ./autogen.sh --prefix=/usr --libdir=/usr/lib/
- make
- sudo make install
- sudo make install
if this doesn't work try
- ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu
instead
for "debug" mode use
- ./autogen.sh --prefix=/usr --libdir=/usr/lib/ --enable-debug
instead
Run
---
@ -51,9 +58,6 @@ See [how to add new effects or how to control the plugin with the keyboard](http
Known Bugs
----------
In Ubuntu over AMD64, try configure with
``--prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu``
If you found a bug please report it at
<https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin/issues>.

13
autogen.sh
View File

@ -383,11 +383,12 @@ for configure_ac in $configure_files; do
if [ -f INSTALL ]; then
cp -pf INSTALL INSTALL.autogen_bak
fi
if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
$AUTOMAKE --gnu --add-missing --force --copy -Wno-portability || exit 1
else
$AUTOMAKE --gnu --add-missing --copy || exit 1
fi
# we shouldn't be using this old stuff ??
# if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
# $AUTOMAKE --gnu --add-missing --force --copy -Wno-portability || exit 1
# else
$AUTOMAKE --gnu --add-missing --copy || exit 1
# fi
if [ -f COPYING.autogen_bak ]; then
cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING
rm -f COPYING.autogen_bak
@ -405,6 +406,8 @@ conf_flags=""
if $want_maintainer_mode; then
conf_flags="--enable-maintainer-mode"
#if you're the maintainer, you should want debug on
conf_flags="--enable-debug"
fi
if test x$NOCONFIGURE = x; then

6
configure.ac
View File

@ -1,7 +1,7 @@
## Process this file with autoconf to produce a configure script.
AC_PREREQ(2.69)
AC_INIT([Infinity plugin],[0.9.0-dev],[https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin/issues],[infinity-plugin],[https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin])
AC_INIT([Infinity plugin],[0.9.1-dev],[https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin/issues],[infinity-plugin],[https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@ -71,8 +71,10 @@ fi
INF_CFLAGS_EXTRA=''
#-Wimplicit
if test x"$GCC" = xyes; then
INF_CFLAGS_EXTRA="${INF_CFLAGS_EXTRA} -Wall -Wimplicit -Wunused -Wmissing-prototypes"
INF_CFLAGS_EXTRA="${INF_CFLAGS_EXTRA} -Wall -Wunused -Wmissing-prototypes"
CXXFLAGS="${CXXFLAGS} -std=gnu++2a"
fi

2
minidocs/controlkeys.md
View File

@ -36,7 +36,7 @@ Keys:
You can change effects using keys:
- F1-F10: choose transformation vector field
- a,z: change curve 1 lighting
- a,y: change curve 1 lighting
- q,s: change curve 2 lighting
- e,r: change curve 1 amplitude
- d,f: change curve 2 amplitude

24
src/audacious.cc
View File

@ -32,27 +32,27 @@ extern "C" {
static const char about_text[] =
"Infinity " PACKAGE_VERSION "\n\n"
"https://gitgud.io/themusicgod1/evacuated-infinity-plugin\n\n"
"Copyright 2016 Duilio Protti\n\n"
"Based on the XMMS plugin:\n"
"Copyright 2000 Julien Carme\n\n"
"https://git.nogafam.es/themusicgod1/evacuated-infinity-plugin\n\n"
"Contributions from:\n"
"Jeff Cliff jeffrey.cliff@gmail.com\n"
"CBke (C) 2016 CBke at NSA/Microsoft github \n"
"Jeff Cliff (CC) 2021 <jeffrey.cliff@gmail.com>\n"
"Duilio Protti (C) 2016 \n"
"CBke (C) 2016 CBke at NSA/Microsoft github \n"
"John Lightsey (C) 2004 <john@nixnuts.net>\n"
"Jean Delvare (C) 2004 <khali@linux-fr.org>\n"
"Will Tatam (C) 2004 <wtatam@premierit.com>\n"
"Haavard Kvaalen (C) 2000 <havardk@xmms.org>\n"
"Chris Lea (C) 2000 <chrislea@luciddesign.com>\n"
"Mitja Horvat (C) 2000 <Mitja.Horvat@hermes.si>\n";
"Mitja Horvat (C) 2000 <Mitja.Horvat@hermes.si>\n"
"Based on the XMMS plugin:\n"
"Copyright 2000 Julien Carme\n\n";
static const PreferencesWidget prefs_fps[] = {
WidgetLabel ("<b>Frames per second</b>"),
WidgetSpin ("Max. :", WidgetInt (CFGID, "max_fps"), {15, 60, 1, "fps"}),
WidgetSpin ("Max. :", WidgetInt (CFGID, "max_fps"), {1, 480, 1, "fps"}),
WidgetLabel ("<b>How often change effect</b>"),
WidgetSpin ("Every", WidgetInt (CFGID, "effect_time"), {50, 500, 5, "frames"}),
WidgetSpin ("Every", WidgetInt (CFGID, "effect_time"), {1, 32000, 10, "frames"}),
WidgetLabel ("<b>How often change colors</b>"),
WidgetSpin ("Every", WidgetInt (CFGID, "palette_time"), {50, 500, 5, "frames"}),
WidgetSpin ("Every", WidgetInt (CFGID, "palette_time"), {25, 2000, 5, "frames"}),
WidgetLabel ("<b>Controls</b>"),
WidgetLabel ("Up/Down:\tup/down main volume"),
@ -150,8 +150,8 @@ static gboolean is_playing() {
}
static gchar* get_title() {
String title = aud_drct_get_title(); // used to have aud_playlist_get_playing() as an argument
return (gchar*) g_strdup (title) ; // ->to_raw() raw_get() ??
String title = aud_drct_get_title(); // used to have aud_playlist_get_playing() as an argument
return (gchar*) g_strdup (title) ; // ->to_raw() raw_get() ??
}
static void play() {

6
src/display.c
View File

@ -283,13 +283,13 @@ gboolean display_resize(gint32 _width, gint32 _height)
inline void display_set_pcm_data(const float *data, int channels)
{
if (channels != 2) {
if (channels > 2 || channels <= 0) {
g_critical("Unsupported number of channels (%d)\n", channels);
return;
}
G_LOCK(pcm_data);
// TODO check this out, different types here...
memcpy(pcm_data, data, 2 * 512 * sizeof(gint16));
memcpy(pcm_data, data, channels * 512 * sizeof(gint16));
G_UNLOCK(pcm_data);
}
@ -423,8 +423,6 @@ void spectral(t_effect *current_effect)
}
/*
* TODO current_effect->curve_color must be a byte. This is related to
* t_effect typo.
*/
void curve(t_effect *current_effect)
{

4
src/infinity.c
View File

@ -152,7 +152,7 @@ static void handle_interactive_mode() {
current_effect.spectral_shift = sx;
if (keystate[SDL_SCANCODE_A])
current_effect.curve_color = wrap(current_effect.curve_color - 32);
if (keystate[SDL_SCANCODE_Z])
if (keystate[SDL_SCANCODE_Y])
current_effect.curve_color = wrap(current_effect.curve_color + 32);
if (keystate[SDL_SCANCODE_Q])
current_effect.spectral_color = wrap(current_effect.spectral_color - 32);
@ -278,7 +278,7 @@ static void check_events()
#ifdef INFINITY_DEBUG
case SDLK_RETURN:
interactive_mode = !interactive_mode;
g_message("Infinity %s interactive mode", interactive_mode ? "entered" : "leaved");
g_message("Infinity %s interactive mode", interactive_mode ? "entered" : "left");
break;
#endif
default: