Commit f2fe4191 authored by Benjamin Drung's avatar Benjamin Drung

Imported Upstream version 2.4~beta1

parent 43e43d59
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
AC_INIT([audacious-plugins], [2.4-alpha2], [bugs+audacious-plugins@atheme.org])
AC_INIT([audacious-plugins], [2.4-beta1], [bugs+audacious-plugins@atheme.org])
AC_PREREQ([2.59])
AC_CANONICAL_HOST
......@@ -133,8 +133,8 @@ dnl These plugins are always built.
INPUT_PLUGINS="tonegen console psf xsf metronom vtx"
OUTPUT_PLUGINS="null"
EFFECT_PLUGINS="compressor crossfade crystalizer ladspa voice_removal sndstretch stereo_plugin echo_plugin"
GENERAL_PLUGINS="song_change alarm skins vfstrace gtkui"
EFFECT_PLUGINS="compressor crossfade crystalizer ladspa sndstretch stereo_plugin voice_removal echo_plugin"
GENERAL_PLUGINS="song_change alarm skins gtkui lyricwiki"
VISUALIZATION_PLUGINS="blur_scope spectrum"
CONTAINER_PLUGINS="m3u pls"
TRANSPORT_PLUGINS="unix-io"
......@@ -238,25 +238,6 @@ case "$target" in
;;
esac
dnl Check for esound
AC_ARG_ENABLE( esd,
[ --disable-esd disable esound output plugin (default=enabled)],
[enable_esd=$enableval],
[enable_esd="yes"]
)
if test "x$enable_esd" = "xyes"; then
PKG_CHECK_MODULES(ESD, [esound >= 0.2],
[have_esd=yes
OUTPUT_PLUGINS="$OUTPUT_PLUGINS esd"],
[have_esd=no]
)
else
AC_MSG_RESULT([*** esound plugin disabled per user request ***])
have_esd=no
fi
dnl *** PulseAudio
AC_ARG_ENABLE( pulse,
......@@ -276,6 +257,25 @@ else
have_pulse=no
fi
dnl *** RoarAudio
AC_ARG_ENABLE(roar,
[ --disable-roar disable PulseAudio output plugin (default=enabled)],
[enable_roar=$enableval],
[enable_roar="yes"]
)
if test "x$enable_roar" = "xyes"; then
PKG_CHECK_MODULES(LIBROAR, [libroar],
[have_roar=yes
OUTPUT_PLUGINS="$OUTPUT_PLUGINS roaraudio"],
[have_roar=no]
)
else
AC_MSG_RESULT([*** pulseaudio output plugin disabled per user request ***])
have_pulse=no
fi
dnl *** CoreAudio
AC_ARG_ENABLE(coreaudio,
......@@ -594,6 +594,25 @@ if test "x$have_aosd" = "xyes"; then
GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
fi
dnl notify: libnotify-based OSD
dnl ===========================
AC_ARG_ENABLE(notify,
[ --disable-notify disable notify plugin (default=enabled)],
[enable_notify=$enableval], [enable_notify="yes"])
if test "x$enable_notify" = "xyes"; then
PKG_CHECK_MODULES(NOTIFY, [libnotify], [have_notify="yes"], [have_notify="no"])
else
have_notify="no"
fi
if test "x$have_notify" = "xyes"; then
GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
fi
dnl *** AdPlug requirement (libbinio)
AC_ARG_ENABLE(adplug,
......@@ -1198,8 +1217,8 @@ esac
dnl *** scrobbler ***
AC_ARG_ENABLE(scrobbler,
[ --enable-scrobbler enable Scrobbler plugin (default=disabled)],
[have_scrobbler=$enableval], [have_scrobbler="no"])
[ --enable-scrobbler enable Scrobbler plugin (default=enabled)],
[have_scrobbler=$enableval], [have_scrobbler="yes"])
if test "x$have_scrobbler" = "xyes"; then
PKG_CHECK_MODULES(CURL, [libcurl >= 7.9.7],
......@@ -1585,7 +1604,7 @@ echo " Open Sound System (oss): $have_oss"
echo " Open Sound System v4 (oss4): $have_oss4"
echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
echo " PulseAudio (pulse): $have_pulse"
echo " Enlightenment Sound Daemon (esd): $have_esd"
echo " RoarAudio (roaraudio): $have_roar"
echo " Jack Audio Connection Kit (jack): $have_jack"
echo " BSD/SUN audio output (sun): $have_sun"
echo " Mac OS X sound support (CoreAudio): $have_coreaudio"
......@@ -1629,6 +1648,7 @@ echo " Song Change: yes"
echo " Status Icon: $have_statusicon"
echo " Audacious OSD: $have_aosd"
echo " -> X Composite support: $have_aosd_xcomp"
echo " libnotify OSD: $have_notify"
echo " Control via event device (evdev-plug): $have_evdevplug"
echo " Global Hotkey Plugin: $have_hotkey"
echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
......@@ -1638,6 +1658,7 @@ echo " Upload to MTP device: $have_mtp_up"
echo " Bluetooth audio support: $have_bluetooth"
echo " MacOS Dock Album Art plugin: $have_dockalbumart"
echo " Streambrowser: $enable_streambrowser"
echo " LyricWiki viewer: yes"
echo
echo " Effect"
echo " ------"
......
......@@ -228,6 +228,8 @@ MSGFMT ?= @MSGFMT@
MSGMERGE ?= @MSGMERGE@
MTP_CFLAGS ?= @MTP_CFLAGS@
MTP_LIBS ?= @MTP_LIBS@
NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
NOTIFY_LIBS ?= @NOTIFY_LIBS@
OBJEXT ?= @OBJEXT@
OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
......@@ -392,3 +394,5 @@ FFMPEG_LIBS ?= @FFMPEG_LIBS@
CUE_CFLAGS ?= @CUE_CFLAGS@
CUE_LIBS ?= @CUE_LIBS@
DEBUG ?= @DEBUG@
LIBROAR_CFLAGS ?= @LIBROAR_CFLAGS@
LIBROAR_LIBS ?= @LIBROAR_LIBS@
......@@ -30,6 +30,7 @@ update-pot:
@echo Updating $(POTTEMPLATE) ...
xgettext --default-domain=$(PACKAGE) --language=C \
--keyword=_ --keyword=N_ --from-code="utf-8" \
--msgid-bugs-address="http://jira.atheme.org/" \
--directory=.. --files-from=POTFILES.in -o $(POTTEMPLATE)
update-po: update-pot
......
# Please don't update this file manually - use ./update-potfiles.sh instead!
src/OSS/OSS.c
src/OSS/configure.c
src/aac/libmp4.c
src/adplug/adplug-xmms.cc
src/alarm/interface.c
......@@ -9,9 +11,9 @@ src/amidi-plug/backend-alsa/b-alsa.c
src/amidi-plug/backend-fluidsynth/b-fluidsynth.c
src/amidi-plug/i_configure-alsa.c
src/amidi-plug/i_configure-ap.c
src/amidi-plug/i_configure.c
src/amidi-plug/i_configure-fluidsynth.c
src/amidi-plug/i_configure-timidity.c
src/amidi-plug/i_configure.c
src/amidi-plug/i_fileinfo.c
src/amidi-plug/i_utils.c
src/aosd/aosd_style.c
......@@ -22,16 +24,14 @@ src/bluetooth/bluetooth.c
src/bluetooth/gui.c
src/bluetooth/scan_gui.c
src/blur_scope/config.c
src/cd-menu-items/cd-menu-items.c
src/cdaudio-ng/cdaudio-ng.c
src/cdaudio-ng/configure.c
src/cd-menu-items/cd-menu-items.c
src/compressor/plugin.c
src/console/abstract_file.cxx
src/console/Ay_Apu.cxx
src/console/Ay_Emu.cxx
src/console/Blip_Buffer.cxx
src/console/Classic_Emu.cxx
src/console/configure.c
src/console/Data_Reader.cxx
src/console/Dual_Resampler.cxx
src/console/Fir_Resampler.cxx
......@@ -46,9 +46,8 @@ src/console/M3u_Playlist.cxx
src/console/Multi_Buffer.cxx
src/console/Music_Emu.cxx
src/console/Nes_Apu.cxx
src/console/Nsfe_Emu.cxx
src/console/Nsf_Emu.cxx
src/console/plugin.c
src/console/Nsfe_Emu.cxx
src/console/Sap_Emu.cxx
src/console/Spc_Cpu.cxx
src/console/Spc_Dsp.cxx
......@@ -56,12 +55,12 @@ src/console/Spc_Emu.cxx
src/console/Vfs_File.cxx
src/console/Vgm_Emu.cxx
src/console/Ym2612_Emu.cxx
src/crossfade/configure.c
src/crossfade/interface-2.0.c
src/console/abstract_file.cxx
src/console/configure.c
src/console/plugin.c
src/crossfade/plugin.c
src/crystalizer/crystalizer.c
src/echo_plugin/gui.c
src/esd/about.c
src/esd/configure.c
src/evdev-plug/ed.c
src/evdev-plug/ed_internals.c
src/evdev-plug/ed_ui.c
......@@ -76,34 +75,32 @@ src/gntui/gntui.c
src/gtkui/actions.c
src/gtkui/ui_gtk.c
src/gtkui/ui_manager.c
src/gtkui/ui_playlist_manager.c
src/gtkui/ui_statusbar.c
src/hotkey/gui.c
src/icecast/icecast.c
src/jack/bio2jack.c
src/jack/configure.c
src/jack/jack.c
src/kanashi/plugin.c
src/ladspa/ladspa.c
src/lirc/about.c
src/lirc/interface.c
src/lirc/lirc.c
src/madplug/configure.c
src/madplug/plugin.c
src/lyricwiki/lyricwiki.c
src/metronom/metronom.c
src/modplug/gui/interface.cxx
src/modplug/gui/main.cxx
src/modplug/gui/modplug.glade
src/modplug/gui/support.cxx
src/mpg123/mpg123.c
src/mtp_up/mtp.c
src/null/null.c
src/OSS4/configure.c
src/OSS4/OSS4.c
src/OSS/configure.c
src/OSS/OSS.c
src/paranormal-ng/plugin.c
src/paranormal/plugin.c
src/oss4/configure.c
src/oss4/plugin.c
src/oss4/utils.c
src/pulse_audio/pulse_audio.c
src/resample/plugin.c
src/scrobbler/configure.c
src/scrobbler/plugin.c
src/scrobbler/scrobbler.c
src/sid/xmms-sid.glade
src/sid/xs_about.c
src/sid/xs_config.c
......@@ -116,7 +113,6 @@ src/skins/ui_equalizer.c
src/skins/ui_main.c
src/skins/ui_manager.c
src/skins/ui_playlist.c
src/skins/ui_playlist_manager.c
src/skins/ui_skinned_equalizer_slider.c
src/skins/ui_skinselector.c
src/skins/util.c
......@@ -124,16 +120,16 @@ src/sndfile/plugin.c
src/sndstretch/sndstretch_xmms.c
src/song_change/song_change.c
src/spectrum/spectrum.c
src/statusicon/si_ui.c
src/statusicon/statusicon.c
src/stereo_plugin/stereo.c
src/streambrowser/gui/streambrowser_win.c
src/streambrowser/streambrowser.c
src/sun/about.c
src/sun/configure.c
src/tonegen/tonegen.c
src/usf/recompiler_cpu.c
src/usf/rsp_recompiler_cpu.c
src/vorbis/configure.c
src/vorbis/vorbis.c
src/vtx/about.c
src/vtx/info.c
src/wavpack/ui.c
src/wavpack/wavpack.c
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -53,7 +53,7 @@ short conv_buf[OUTPUT_BUFSIZE]; /* buffer used to hold format converted input
/*
* The format of the data from the input plugin
* This will never change during a song.
* This will never change during a song.
*/
struct format_info input;
......@@ -90,7 +90,7 @@ static int osx_calc_bitrate(int osx_fmt, int rate, int channels)
return bitrate;
}
static gboolean osx_format_is_neutral(AFormat fmt)
static gboolean osx_format_is_neutral(gint fmt)
{
gboolean ret = FALSE;
......@@ -109,7 +109,7 @@ static gboolean osx_format_is_neutral(AFormat fmt)
return ret;
}
static int osx_get_format(AFormat fmt)
static int osx_get_format(gint fmt)
{
int format = 0;
......@@ -137,7 +137,7 @@ static int osx_get_format(AFormat fmt)
return format;
}
static int osx_get_conv_format(AFormat fmt)
static int osx_get_conv_format(gint fmt)
{
int format = 0;
......@@ -248,7 +248,7 @@ OSStatus play_callback(AudioDeviceID inDevice, const AudioTimeStamp * inNow, con
memset(dest,0,(src_size_float - num_output_samples) * sizeof(float));
}
// move unwritten data to beginning of buffer
{
dest = buffer;
......@@ -283,7 +283,7 @@ OSStatus play_callback(AudioDeviceID inDevice, const AudioTimeStamp * inNow, con
}
static void osx_setup_format(AFormat fmt, int rate, int nch)
static void osx_setup_format(gint fmt, int rate, int nch)
{
//printf("osx_setup_format(): fmt %d, rate %d, nch %d\n",fmt,rate,nch);
......@@ -328,7 +328,7 @@ gint osx_get_output_time(void)
retval = output_time_offset + ((output_total * sample_size * 1000) / output.bps);
retval = (int)((float)retval / user_pitch);
//printf("osx_get_output_time(): time is %d\n",retval);
return retval;
......@@ -380,7 +380,7 @@ gint osx_free(void)
// get number of free samples
bytes_free = buffer_size - buffer_index;
// adjust for mono
if (input.channels == 1)
{
......@@ -422,12 +422,12 @@ void osx_write(gpointer ptr, int length)
if (osx_convert_func != NULL)
osx_convert_func(&ptr, length);
// step through audio
// step through audio
while (num_samples > 0)
{
// get # of samples to write to the buffer
count = MIN(num_samples, osx_free()/sample_size);
src = ptr+offset;
if (dbconvert((char*)src,count * sample_size) == -1)
......@@ -438,7 +438,7 @@ void osx_write(gpointer ptr, int length)
{
src = output_buf;
dest = (float*)(buffer + buffer_index);
//printf("output_buf_length is %d\n",output_buf_length);
for (i = 0; i < output_buf_length; i++)
......@@ -478,7 +478,7 @@ void osx_close(void)
playing_flag = 0;
// close audio device
AudioDeviceStop(device_id, play_callback);
AudioDeviceStop(device_id, play_callback);
AudioDeviceRemoveIOProc(device_id, play_callback);
g_free(device_name);
......@@ -522,7 +522,7 @@ void osx_set_audio_params(void)
//printf("osx_set_audio_params(): fmt %d, freq %d, nch %d\n",output.format.osx,output.frequency,output.channels);
// set audio format
// set audio format
// set num channels
......@@ -532,10 +532,10 @@ void osx_set_audio_params(void)
case 2: stereo_multiplier = 1; break;
default: stereo_multiplier = 1; break;
}
switch (input.format.xmms)
{
case FMT_U8:
case FMT_U8:
case FMT_S8:
format_multiplier = 2;
sample_size = 1;
......@@ -557,7 +557,7 @@ void osx_set_audio_params(void)
}
gint osx_open(AFormat fmt, gint rate, gint nch)
gint osx_open(gint fmt, gint rate, gint nch)
{
char s[32];
long m;
......
......@@ -53,11 +53,11 @@
extern OutputPlugin op;
struct format_info
struct format_info
{
union
union
{
AFormat xmms;
gint xmms;
int osx;
} format;
......@@ -95,7 +95,7 @@ void osx_write(void *ptr, int length);
void osx_close(void);
void osx_flush(int time);
void osx_pause(short p);
int osx_open(AFormat fmt, int rate, int nch);
int osx_open(gint fmt, int rate, int nch);
int osx_get_output_time(void);
int osx_get_written_time(void);
void osx_set_audio_params(void);
......
......@@ -22,6 +22,8 @@
#include "OSS.h"
#include <glib.h>
#include <audacious/configdb.h>
#include <audacious/i18n.h>
#include <libaudgui/libaudgui.h>
#include <libaudgui/libaudgui-gtk.h>
......
......@@ -60,10 +60,10 @@ void oss_write(void *ptr, int length);
void oss_close(void);
void oss_flush(int time);
void oss_pause(short p);
int oss_open(AFormat fmt, int rate, int nch);
int oss_open(gint fmt, int rate, int nch);
int oss_get_output_time(void);
int oss_get_written_time(void);
void oss_set_audio_params(void);
void oss_tell(AFormat * fmt, gint * rate, gint * nch);
void oss_tell(gint * fmt, gint * rate, gint * nch);
#endif
......@@ -30,6 +30,8 @@ extern void close_mixer_device();
#include <sys/ioctl.h>
#include <sys/time.h>
#include <audacious/audconfig.h>
#include "OSS.h"
......@@ -50,7 +52,7 @@ static gboolean select_works;
struct format_info {
union {
AFormat xmms;
gint xmms;
int oss;
} format;
int frequency;
......@@ -98,7 +100,7 @@ oss_calc_bitrate(int oss_fmt, int rate, int channels)
}
static int
oss_get_format(AFormat fmt)
oss_get_format(gint fmt)
{
int format = 0;
......@@ -129,7 +131,7 @@ oss_get_format(AFormat fmt)
}
static void
oss_setup_format(AFormat fmt, int rate, int nch)
oss_setup_format(gint fmt, int rate, int nch)
{
output.bps = oss_calc_bitrate(oss_get_format(fmt), rate, nch);
output.format.oss = oss_get_format(fmt);
......@@ -394,7 +396,7 @@ oss_set_audio_params(void)
}
gint
oss_open(AFormat fmt, gint rate, gint nch)
oss_open(gint fmt, gint rate, gint nch)
{
if (oss_cfg.use_alt_audio_device && oss_cfg.alt_audio_device)
......@@ -450,7 +452,7 @@ oss_open(AFormat fmt, gint rate, gint nch)
return 1;
}
void oss_tell(AFormat * fmt, gint * rate, gint * nch)
void oss_tell(gint * fmt, gint * rate, gint * nch)
{
(*fmt) = input.format.xmms;
(*rate) = input.frequency;
......
......@@ -26,9 +26,9 @@
#include <stdio.h>
#include <string.h>
#include <audacious/configdb.h>
#include <audacious/i18n.h>
static GtkWidget *configure_win = NULL;
static GtkWidget *mixer_usemaster_check, *buffer_pre_spin;
static GtkWidget *adevice_use_alt_check, *audio_alt_device_entry;
......
......@@ -9,6 +9,7 @@
#include <audacious/plugin.h>
#include <audacious/i18n.h>
#include <libaudcore/audstrings.h>
#include <libaudgui/libaudgui.h>
#include <libaudgui/libaudgui-gtk.h>
......@@ -60,7 +61,7 @@ static guint32 mp4_read_callback(void *data, void *buffer, guint32 len)
if (data == NULL || buffer == NULL)
return -1;
return aud_vfs_fread(buffer, 1, len, (VFSFile *) data);
return vfs_fread(buffer, 1, len, (VFSFile *) data);
}
static guint32 mp4_seek_callback (void * data, guint64 pos)
......@@ -68,7 +69,7 @@ static guint32 mp4_seek_callback (void * data, guint64 pos)
g_return_val_if_fail (data != NULL, -1);
g_return_val_if_fail (pos <= G_MAXLONG, -1);
return aud_vfs_fseek((VFSFile *) data, pos, SEEK_SET);
return vfs_fseek((VFSFile *) data, pos, SEEK_SET);
}
static void mp4_init(void)
......@@ -195,7 +196,7 @@ static gboolean parse_aac_stream (VFSFile * stream)
size = 0; /* avoid bogus uninitialized variable warning */
if (aud_vfs_fread (data, 1, sizeof data, stream) != sizeof data)
if (vfs_fread (data, 1, sizeof data, stream) != sizeof data)
{
PROBE_DEBUG ("Read failed.\n");
return FALSE;
......@@ -268,12 +269,12 @@ static gint mp4_is_our_fd(const gchar *filename, VFSFile* file)
gchar magic[8];
extension = strrchr(filename, '.');
aud_vfs_fread(magic, 1, 8, file);
aud_vfs_rewind(file);
vfs_fread(magic, 1, 8, file);
vfs_rewind(file);
if (parse_aac_stream(file) == TRUE)
return 1;
aud_vfs_fseek (file, 0, SEEK_SET);
vfs_fseek (file, 0, SEEK_SET);
return is_mp4_aac_file (file);
}
......@@ -310,7 +311,7 @@ static void calc_aac_info (VFSFile * handle, gint * length, gint * bitrate,
NeAACDecHandle decoder;
NeAACDecFrameInfo frame;
gboolean initted = FALSE;
gint size = aud_vfs_fsize (handle);
gint size = vfs_fsize (handle);
guchar buffer[BUFFER_SIZE];
gint offset = 0, filled = 0;
gint found, bytes_used = 0, time_used = 0;
......@@ -324,7 +325,7 @@ static void calc_aac_info (VFSFile * handle, gint * length, gint * bitrate,
/* look for a representative bitrate in the middle of the file */
if (size > 0)
aud_vfs_fseek (handle, size / 2, SEEK_SET);
vfs_fseek (handle, size / 2, SEEK_SET);
for (found = 0; found < 32; found ++)
{
......@@ -333,7 +334,7 @@ static void calc_aac_info (VFSFile * handle, gint * length, gint * bitrate,
memmove (buffer, buffer + offset, filled);
offset = 0;
if (aud_vfs_fread (buffer + filled, 1, BUFFER_SIZE - filled, handle)
if (vfs_fread (buffer + filled, 1, BUFFER_SIZE - filled, handle)
!= BUFFER_SIZE - filled)
{
PROBE_DEBUG ("Read failed.\n");
......@@ -417,7 +418,7 @@ static Tuple * aac_get_tuple (const gchar * filename, VFSFile * handle)
tuple_associate_string (tuple, FIELD_CODEC, NULL, "MPEG-2/4 AAC");
if (! aud_vfs_is_remote (filename))
if (! vfs_is_remote (filename))
{
calc_aac_info (handle, & length, & bitrate, & samplerate, & channels);
......@@ -428,21 +429,21 @@ static Tuple * aac_get_tuple (const gchar * filename, VFSFile * handle)
tuple_associate_int (tuple, FIELD_BITRATE, NULL, bitrate);
}
temp = aud_vfs_get_metadata (handle, "track-name");
temp = vfs_get_metadata (handle, "track-name");
if (temp != NULL)
{
tuple_associate_string (tuple, FIELD_TITLE, NULL, temp);
g_free (temp);
}
temp = aud_vfs_get_metadata (handle, "stream-name");
temp = vfs_get_metadata (handle, "stream-name");
if (temp != NULL)
{
tuple_associate_string (tuple, FIELD_ALBUM, NULL, temp);