- update to 1.5.1
- remove arts, esd and oss (from brad) - add jack pseudo flavor (from brad) - add wavpack - add sndio, based on xmms' sndio support from Thomas Pfaff input, some testing and ok sthen@.
This commit is contained in:
fgsch
parent
a2d3f6cb2d
commit
be18b8815a
@ -1,49 +1,47 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2008/09/15 22:02:44 jakemsr Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2009/01/25 02:07:06 fgsch Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
COMMENT-main= input and output plugins for audacious
|
||||
COMMENT-arts= arts helper and plugin for audacious
|
||||
COMMENT-main = input and output plugins for audacious
|
||||
COMMENT-jack = jack plugin for audacious
|
||||
|
||||
V= 1.5.0
|
||||
DISTNAME= audacious-plugins-$V
|
||||
PKGNAME-main= ${DISTNAME}p1
|
||||
PKGNAME-arts= audacious-arts-$Vp1
|
||||
V = 1.5.1
|
||||
DISTNAME = audacious-plugins-$V
|
||||
PKGNAME-main = ${DISTNAME}
|
||||
PKGNAME-jack = audacious-jack-$V
|
||||
|
||||
CATEGORIES= audio multimedia
|
||||
CATEGORIES = audio multimedia
|
||||
|
||||
HOMEPAGE= http://audacious-media-player.org/
|
||||
HOMEPAGE = http://audacious-media-player.org/
|
||||
|
||||
# GPL
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM = Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
|
||||
WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
|
||||
Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
|
||||
freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \
|
||||
freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz \
|
||||
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv \
|
||||
intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
|
||||
png stdc++ z
|
||||
WANTLIB-main= ${WANTLIB} dbus-1 dbus-glib-1 mowgli ogg samplerate ossaudio
|
||||
WANTLIB-arts= ${WANTLIB} c pthread
|
||||
png z
|
||||
WANTLIB-main = ${WANTLIB} dbus-1 dbus-glib-1 mowgli ogg sndio stdc++
|
||||
WANTLIB-jack = ${WANTLIB} jack samplerate
|
||||
|
||||
MASTER_SITES= http://distfiles.atheme.org/
|
||||
MASTER_SITES = http://distfiles.atheme.org/
|
||||
|
||||
EXTRACT_SUFX= .tgz
|
||||
EXTRACT_SUFX = .tgz
|
||||
|
||||
MULTI_PACKAGES= -main
|
||||
MULTI_PACKAGES = -main
|
||||
|
||||
BUILD_DEPENDS= ${RUN_DEPENDS-main}
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS-main}
|
||||
|
||||
RUN_DEPENDS-main= :audacious->=1.5:audio/audacious
|
||||
RUN_DEPENDS-arts= ::audio/audacious-plugins,-main
|
||||
RUN_DEPENDS-main = :audacious->=1.5.1:audio/audacious
|
||||
RUN_DEPENDS-jack = ::audio/audacious-plugins,-main
|
||||
|
||||
LIB_DEPENDS-main= esd.>=2::audio/esound \
|
||||
faad.>=2,mp4ff.>=1::audio/faad \
|
||||
LIB_DEPENDS-main = faad.>=2,mp4ff.>=1::audio/faad \
|
||||
FLAC.>=7::audio/flac \
|
||||
jack::audio/jack \
|
||||
mp3lame::audio/lame \
|
||||
mad::audio/libmad \
|
||||
cddb,cdio,cdio_cdda::audio/libcdio \
|
||||
@ -51,50 +49,56 @@ LIB_DEPENDS-main= esd.>=2::audio/esound \
|
||||
sndfile.>=2::audio/libsndfile \
|
||||
vorbis.>=5,vorbisfile.>=4,vorbisenc::audio/libvorbis \
|
||||
tag.>=6:taglib->=1.4:audio/taglib \
|
||||
audiofile::devel/libaudiofile \
|
||||
wavpack.>=0::audio/wavpack \
|
||||
SDL.>=6::devel/sdl \
|
||||
curl.>=5::net/curl \
|
||||
neon.>=26::net/neon \
|
||||
xml2::textproc/libxml
|
||||
LIB_DEPENDS-arts= artsc.>=1::x11/kde/arts3
|
||||
LIB_DEPENDS-jack = jack::audio/jack
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
PSEUDO_FLAVORS = no_jack
|
||||
FLAVOR ?=
|
||||
|
||||
PSEUDO_FLAVORS= no_arts
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:Mno_arts}
|
||||
CONFIGURE_ARGS+=--disable-arts
|
||||
.if ${FLAVOR:Mno_jack}
|
||||
CONFIGURE_ARGS += --disable-jack
|
||||
.else
|
||||
MULTI_PACKAGES+=-arts
|
||||
MULTI_PACKAGES += -jack
|
||||
.endif
|
||||
|
||||
AUTOCONF_VERSION= 2.61
|
||||
USE_X11 = Yes
|
||||
USE_GMAKE = Yes
|
||||
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS+= --enable-ipv6 \
|
||||
--with-dev-dsp=/dev/audio \
|
||||
AUTOCONF_VERSION = 2.61
|
||||
|
||||
CONFIGURE_STYLE = autoconf
|
||||
CONFIGURE_ARGS += --enable-ipv6 \
|
||||
--enable-sndio \
|
||||
--disable-esd \
|
||||
--disable-pulse \
|
||||
--disable-altivec \
|
||||
--disable-lirc \
|
||||
--disable-rootvis \
|
||||
--disable-adplug \
|
||||
--disable-wavpack \
|
||||
--disable-arts \
|
||||
--disable-sid \
|
||||
--disable-oss \
|
||||
--disable-alsa \
|
||||
--disable-amidiplug \
|
||||
--disable-mms \
|
||||
--disable-mtp_up \
|
||||
--disable-projectm \
|
||||
--disable-projectm-1.0
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
.if ${MACHINE_ARCH} != "amd64"
|
||||
CONFIGURE_ARGS+= --disable-sse2
|
||||
CONFIGURE_ARGS += --disable-sse2
|
||||
.endif
|
||||
|
||||
NO_REGRESS= Yes
|
||||
NO_REGRESS = Yes
|
||||
|
||||
post-patch:
|
||||
@mkdir -p ${WRKSRC}/src/sndio
|
||||
@cp ${FILESDIR}/{Makefile,sndio.c} ${WRKSRC}/src/sndio
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (audacious-plugins-1.5.0.tgz) = Qsgv//1XrKYSFBvBBrn1Hg==
|
||||
RMD160 (audacious-plugins-1.5.0.tgz) = CkTN2ZgZuXabWyYNxB1UYnimQDk=
|
||||
SHA1 (audacious-plugins-1.5.0.tgz) = fNFXsGY2dObCccsDU/uR4Gj5H34=
|
||||
SHA256 (audacious-plugins-1.5.0.tgz) = VmvIy3OWf4X8CMudbekP1OBm+n+hN2FLPHGpPq2vZVI=
|
||||
SIZE (audacious-plugins-1.5.0.tgz) = 2961507
|
||||
MD5 (audacious-plugins-1.5.1.tgz) = BXuR8zqvBrtM3nJgF3wvXw==
|
||||
RMD160 (audacious-plugins-1.5.1.tgz) = S5/CnM9h0aUD8Q8GDL3uixSPKLg=
|
||||
SHA1 (audacious-plugins-1.5.1.tgz) = YwyTYCfGZkl5XKxzJ89qs1kNPkk=
|
||||
SHA256 (audacious-plugins-1.5.1.tgz) = rtM3MsVVZmBKJM0s0XUcJNFZ/47KUQZHxcPHiJ/YrhU=
|
||||
SIZE (audacious-plugins-1.5.1.tgz) = 2944448
|
||||
|
||||
12
audio/audacious-plugins/files/Makefile
Normal file
12
audio/audacious-plugins/files/Makefile
Normal file
@ -0,0 +1,12 @@
|
||||
PLUGIN = sndio${PLUGIN_SUFFIX}
|
||||
|
||||
SRCS = sndio.c
|
||||
|
||||
include ../../buildsys.mk
|
||||
include ../../extra.mk
|
||||
|
||||
plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
|
||||
|
||||
CFLAGS += ${PLUGIN_CFLAGS}
|
||||
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} -I../..
|
||||
LIBS += ${GTK_LIBS} ${GLIB_LIBS} -lsndio
|
||||
374
audio/audacious-plugins/files/sndio.c
Normal file
374
audio/audacious-plugins/files/sndio.c
Normal file
@ -0,0 +1,374 @@
|
||||
/*
|
||||
* Copyright (c) 2008,2009 Thomas Pfaff <tpfaff@tp76.info>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <sndio.h>
|
||||
#include <audacious/i18n.h>
|
||||
#include <audacious/plugin.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
void sndio_init(void);
|
||||
void sndio_about(void);
|
||||
void sndio_configure(void);
|
||||
void sndio_get_volume(gint *, gint *);
|
||||
void sndio_set_volume(gint, gint);
|
||||
gint sndio_open(AFormat, gint, gint);
|
||||
void sndio_write(gpointer, gint);
|
||||
void sndio_close(void);
|
||||
void sndio_flush(gint);
|
||||
void sndio_pause(gshort);
|
||||
gint sndio_free(void);
|
||||
gint sndio_playing(void);
|
||||
gint sndio_output_time(void);
|
||||
gint sndio_written_time(void);
|
||||
|
||||
void onmove_cb(void *, int);
|
||||
|
||||
void configure_win_ok_cb(GtkWidget *, gpointer);
|
||||
|
||||
static struct sio_par par;
|
||||
static struct sio_hdl *hdl;
|
||||
static long long rdpos;
|
||||
static long long wrpos;
|
||||
static int paused;
|
||||
static int volume;
|
||||
static long bytes_per_sec;
|
||||
|
||||
static GtkWidget *configure_win;
|
||||
static GtkWidget *adevice_entry;
|
||||
static gchar *audiodev;
|
||||
|
||||
OutputPlugin sndio_op = {
|
||||
.description = "Sndio Output Plugin",
|
||||
.init = sndio_init,
|
||||
.cleanup = NULL,
|
||||
.about = sndio_about,
|
||||
.configure = sndio_configure,
|
||||
.get_volume = sndio_get_volume,
|
||||
.set_volume = sndio_set_volume,
|
||||
.open_audio = sndio_open,
|
||||
.write_audio = sndio_write,
|
||||
.close_audio = sndio_close,
|
||||
.flush = sndio_flush,
|
||||
.pause = sndio_pause,
|
||||
.buffer_free = sndio_free,
|
||||
.buffer_playing = sndio_playing,
|
||||
.output_time = sndio_output_time,
|
||||
.written_time = sndio_written_time
|
||||
};
|
||||
|
||||
OutputPlugin *sndio_oplist[] = { &sndio_op, NULL };
|
||||
|
||||
SIMPLE_OUTPUT_PLUGIN(sndio, sndio_oplist);
|
||||
|
||||
void
|
||||
sndio_about(void)
|
||||
{
|
||||
static GtkWidget *about;
|
||||
|
||||
if (about != NULL)
|
||||
return;
|
||||
|
||||
about = audacious_info_dialog(
|
||||
_("About Sndio Output Plugin"),
|
||||
_("Sndio Output Plugin\n\n"
|
||||
"Written by Thomas Pfaff <tpfaff@tp76.info>\n"),
|
||||
_("Ok"), FALSE, NULL, NULL);
|
||||
|
||||
gtk_signal_connect(GTK_OBJECT(about), "destroy",
|
||||
GTK_SIGNAL_FUNC(gtk_widget_destroyed), &about);
|
||||
}
|
||||
|
||||
void
|
||||
sndio_init(void)
|
||||
{
|
||||
mcs_handle_t *cfgfile;
|
||||
|
||||
cfgfile = aud_cfg_db_open();
|
||||
aud_cfg_db_get_int(cfgfile, "sndio", "volume", &volume);
|
||||
aud_cfg_db_get_string(cfgfile, "sndio", "audiodev", &audiodev);
|
||||
aud_cfg_db_close(cfgfile);
|
||||
|
||||
if (!volume)
|
||||
volume = 100;
|
||||
if (!audiodev)
|
||||
audiodev = g_strdup("");
|
||||
}
|
||||
|
||||
void
|
||||
sndio_get_volume(gint *l, gint *r)
|
||||
{
|
||||
*l = *r = volume;
|
||||
}
|
||||
|
||||
void
|
||||
sndio_set_volume(gint l, gint r)
|
||||
{
|
||||
/* Ignore balance control, so use unattenuated channel. */
|
||||
volume = l > r ? l : r;
|
||||
if (hdl)
|
||||
sio_setvol(hdl, volume * SIO_MAXVOL / 100);
|
||||
}
|
||||
|
||||
gint
|
||||
sndio_open(AFormat fmt, gint rate, gint nch)
|
||||
{
|
||||
struct sio_par askpar;
|
||||
|
||||
hdl = sio_open(strlen(audiodev) > 0 ? audiodev : NULL, SIO_PLAY, 0);
|
||||
if (!hdl) {
|
||||
g_warning("failed to open audio device %s", audiodev);
|
||||
return (0);
|
||||
}
|
||||
|
||||
sio_initpar(&par);
|
||||
switch (fmt) {
|
||||
case FMT_U8:
|
||||
par.bits = 8;
|
||||
par.sig = 0;
|
||||
break;
|
||||
case FMT_S8:
|
||||
par.bits = 8;
|
||||
par.sig = 1;
|
||||
break;
|
||||
case FMT_U16_LE:
|
||||
par.bits = 16;
|
||||
par.sig = 0;
|
||||
par.le = 1;
|
||||
break;
|
||||
case FMT_U16_BE:
|
||||
par.bits = 16;
|
||||
par.sig = 0;
|
||||
par.le = 0;
|
||||
break;
|
||||
case FMT_U16_NE:
|
||||
par.bits = 16;
|
||||
par.sig = 0;
|
||||
par.le = SIO_LE_NATIVE;
|
||||
break;
|
||||
case FMT_S16_LE:
|
||||
par.bits = 16;
|
||||
par.sig = 1;
|
||||
par.le = 1;
|
||||
break;
|
||||
case FMT_S16_BE:
|
||||
par.bits = 16;
|
||||
par.sig = 1;
|
||||
par.le = 0;
|
||||
case FMT_S16_NE:
|
||||
par.bits = 16;
|
||||
par.sig = 1;
|
||||
par.le = SIO_LE_NATIVE;
|
||||
break;
|
||||
default:
|
||||
g_warning("unknown format %d requested", fmt);
|
||||
sndio_close();
|
||||
return (0);
|
||||
}
|
||||
par.pchan = nch;
|
||||
par.rate = rate;
|
||||
|
||||
/* 250 ms buffer */
|
||||
par.appbufsz = par.rate / 4;
|
||||
|
||||
askpar = par;
|
||||
if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
|
||||
g_warning("failed to set parameters");
|
||||
sndio_close();
|
||||
return (0);
|
||||
}
|
||||
|
||||
if ((par.bits == 16 && par.le != askpar.le) ||
|
||||
par.bits != askpar.bits ||
|
||||
par.sig != askpar.sig ||
|
||||
par.pchan != askpar.pchan ||
|
||||
par.rate != askpar.rate) {
|
||||
g_warning("parameters not supported");
|
||||
audacious_info_dialog(_("Unsupported format"),
|
||||
_("A format not supported by the audio device "
|
||||
"was requested.\n\n"
|
||||
"Please try again with the aucat(1) server running."),
|
||||
_("OK"), FALSE, NULL, NULL);
|
||||
sndio_close();
|
||||
return (0);
|
||||
}
|
||||
|
||||
rdpos = 0;
|
||||
wrpos = 0;
|
||||
sio_onmove(hdl, onmove_cb, NULL);
|
||||
|
||||
paused = 0;
|
||||
if (!sio_start(hdl)) {
|
||||
g_warning("failed to start audio device");
|
||||
sndio_close();
|
||||
return (0);
|
||||
}
|
||||
|
||||
bytes_per_sec = par.bps * par.pchan * par.rate;
|
||||
|
||||
sndio_set_volume(volume, volume);
|
||||
return (1);
|
||||
}
|
||||
|
||||
void
|
||||
sndio_write(gpointer ptr, gint length)
|
||||
{
|
||||
if (!paused)
|
||||
wrpos += sio_write(hdl, ptr, length);
|
||||
}
|
||||
|
||||
void
|
||||
sndio_close(void)
|
||||
{
|
||||
mcs_handle_t *cfgfile;
|
||||
|
||||
if (!hdl)
|
||||
return;
|
||||
|
||||
cfgfile = aud_cfg_db_open();
|
||||
aud_cfg_db_set_int(cfgfile, "sndio", "volume", volume);
|
||||
aud_cfg_db_close(cfgfile);
|
||||
|
||||
sio_close(hdl);
|
||||
hdl = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
sndio_flush(gint time)
|
||||
{
|
||||
int bufused = (rdpos < 0) ? wrpos : wrpos - rdpos;
|
||||
rdpos = time / 1000 * bytes_per_sec;
|
||||
wrpos = rdpos + bufused;
|
||||
}
|
||||
|
||||
void
|
||||
sndio_pause(gshort flag)
|
||||
{
|
||||
paused = flag;
|
||||
}
|
||||
|
||||
gint
|
||||
sndio_free(void)
|
||||
{
|
||||
return (paused ? 0 : 1000000);
|
||||
}
|
||||
|
||||
gint
|
||||
sndio_playing(void)
|
||||
{
|
||||
return (paused ? TRUE : FALSE);
|
||||
}
|
||||
|
||||
gint
|
||||
sndio_output_time(void)
|
||||
{
|
||||
return (hdl ? rdpos * 1000 / bytes_per_sec : 0);
|
||||
}
|
||||
|
||||
gint
|
||||
sndio_written_time(void)
|
||||
{
|
||||
return (hdl ? wrpos * 1000 / bytes_per_sec : 0);
|
||||
}
|
||||
|
||||
void
|
||||
onmove_cb(void *addr, int delta)
|
||||
{
|
||||
rdpos += delta *(int)(par.bps * par.pchan);
|
||||
}
|
||||
|
||||
void
|
||||
configure_win_ok_cb(GtkWidget *w, gpointer data)
|
||||
{
|
||||
mcs_handle_t *cfgfile;
|
||||
|
||||
strlcpy(audiodev, gtk_entry_get_text(GTK_ENTRY(adevice_entry)),
|
||||
PATH_MAX);
|
||||
|
||||
cfgfile = aud_cfg_db_open();
|
||||
aud_cfg_db_set_string(cfgfile, "sndio", "audiodev", audiodev);
|
||||
aud_cfg_db_close(cfgfile);
|
||||
|
||||
gtk_widget_destroy(configure_win);
|
||||
}
|
||||
|
||||
void
|
||||
sndio_configure(void)
|
||||
{
|
||||
GtkWidget *vbox;
|
||||
GtkWidget *adevice_frame, *adevice_text, *adevice_vbox;
|
||||
GtkWidget *bbox, *ok, *cancel;
|
||||
|
||||
if (configure_win) {
|
||||
gtk_window_present(GTK_WINDOW(configure_win));
|
||||
return;
|
||||
}
|
||||
|
||||
configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
|
||||
GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);
|
||||
|
||||
gtk_window_set_title(GTK_WINDOW(configure_win), _("sndio device"));
|
||||
gtk_window_set_policy(GTK_WINDOW(configure_win), FALSE, FALSE, FALSE);
|
||||
gtk_window_set_position(GTK_WINDOW(configure_win), GTK_WIN_POS_MOUSE);
|
||||
gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
|
||||
|
||||
vbox = gtk_vbox_new(FALSE, 5);
|
||||
gtk_container_add(GTK_CONTAINER(configure_win), vbox);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
|
||||
|
||||
adevice_frame = gtk_frame_new(_("Audio device:"));
|
||||
gtk_box_pack_start(GTK_BOX(vbox), adevice_frame, FALSE, FALSE, 0);
|
||||
|
||||
adevice_vbox = gtk_vbox_new(FALSE, 5);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(adevice_vbox), 5);
|
||||
gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_vbox);
|
||||
|
||||
adevice_text = gtk_label_new(_("(empty means default)"));
|
||||
gtk_box_pack_start_defaults(GTK_BOX(adevice_vbox), adevice_text);
|
||||
|
||||
adevice_entry = gtk_entry_new();
|
||||
gtk_entry_set_text(GTK_ENTRY(adevice_entry), audiodev);
|
||||
gtk_box_pack_start_defaults(GTK_BOX(adevice_vbox), adevice_entry);
|
||||
|
||||
bbox = gtk_hbutton_box_new();
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
||||
|
||||
ok = gtk_button_new_with_label(_("OK"));
|
||||
gtk_signal_connect(GTK_OBJECT(ok), "clicked",
|
||||
GTK_SIGNAL_FUNC(configure_win_ok_cb), NULL);
|
||||
|
||||
GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
|
||||
gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
|
||||
gtk_widget_grab_default(ok);
|
||||
|
||||
cancel = gtk_button_new_with_label(_("Cancel"));
|
||||
gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked",
|
||||
GTK_SIGNAL_FUNC(gtk_widget_destroy),
|
||||
GTK_OBJECT(configure_win));
|
||||
|
||||
GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
|
||||
gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
|
||||
|
||||
gtk_widget_show_all(configure_win);
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2008/04/02 00:39:19 fgsch Exp $
|
||||
--- configure.ac.orig Thu Mar 13 22:22:35 2008
|
||||
+++ configure.ac Mon Mar 31 23:08:49 2008
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2009/01/25 02:07:06 fgsch Exp $
|
||||
--- configure.ac.orig Fri May 23 23:44:19 2008
|
||||
+++ configure.ac Wed Jan 21 00:43:22 2009
|
||||
@@ -811,13 +811,21 @@ AC_ARG_ENABLE( jack,
|
||||
[enable_jack="yes"])
|
||||
|
||||
if test "x$enable_jack" = xyes; then
|
||||
if test "x$enable_jack" = "xyes"; then
|
||||
- AM_PATH_JACK(have_jack=yes, have_jack=no)
|
||||
+ PKG_CHECK_MODULES(JACK, jack >= 0.109.10, , [AC_MSG_WARN(
|
||||
+ [*** Cannot find jack 0.109.10 or newer, jack will not be built ***])
|
||||
@ -15,18 +15,39 @@ $OpenBSD: patch-configure_ac,v 1.1 2008/04/02 00:39:19 fgsch Exp $
|
||||
+ enable_jack=no
|
||||
fi
|
||||
|
||||
-if test "$have_jack" = yes; then
|
||||
-if test "x$have_jack" = "xyes"; then
|
||||
+if test "x$enable_jack" = xyes; then
|
||||
+ PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, , [AC_MSG_WARN(
|
||||
+ [Could not find libsamplerate, necessary for jack output plugin.])
|
||||
+ enable_jack=no])
|
||||
+ PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, , [AC_MSG_WARN(
|
||||
+ [Could not find libsamplerate, necessary for jack output plugin.])
|
||||
+ enable_jack=no])
|
||||
+fi
|
||||
+
|
||||
+if test "x$enable_jack" = xyes; then
|
||||
OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
|
||||
fi
|
||||
|
||||
@@ -1636,7 +1644,7 @@ echo " Open Sound System (oss): $have_
|
||||
@@ -1549,6 +1557,20 @@ fi
|
||||
AC_SUBST(FILEWRITER_CFLAGS)
|
||||
AC_SUBST(FILEWRITER_LIBS)
|
||||
|
||||
+dnl *** sndio
|
||||
+
|
||||
+AC_ARG_ENABLE(sndio,
|
||||
+ [ --enable-sndio enable sndio output plugin (default=disabled) ],
|
||||
+ [have_sndio=$enableval],
|
||||
+ [have_sndio=no]
|
||||
+)
|
||||
+
|
||||
+if test "x$have_sndio" = "xyes"; then
|
||||
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
|
||||
+else
|
||||
+ have_sndio=no
|
||||
+fi
|
||||
+
|
||||
dnl *** End of all plugin checks ***
|
||||
|
||||
AC_SUBST(ARCH_DEFINES)
|
||||
@@ -1636,7 +1658,7 @@ echo " Open Sound System (oss): $have_
|
||||
echo " Open Sound System v4 (oss4): $have_oss4"
|
||||
echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
|
||||
echo " Enlightenment Sound Daemon (esd): $have_esd"
|
||||
@ -35,3 +56,11 @@ $OpenBSD: patch-configure_ac,v 1.1 2008/04/02 00:39:19 fgsch Exp $
|
||||
echo " Analog Realtime Synthesizer (arts): $have_arts"
|
||||
echo " BSD/SUN audio output (sun): $have_sun"
|
||||
echo " PulseAudio sound server (pulse_audio): $have_pulse"
|
||||
@@ -1646,6 +1668,7 @@ echo " -> FileWriter MP3 output part: $have_
|
||||
echo " -> FileWriter Vorbis output part: $have_vorbisenc"
|
||||
echo " -> FileWriter FLAC output part: $have_writer_flac"
|
||||
echo " Null Audio output (null): yes"
|
||||
+echo " Sndio Audio output (sndio): $have_sndio"
|
||||
echo
|
||||
echo " Input Plugins"
|
||||
echo " -------------"
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-m4_arts_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
|
||||
--- m4/arts.m4.orig Mon Mar 31 16:28:15 2008
|
||||
+++ m4/arts.m4 Mon Mar 31 16:29:16 2008
|
||||
@@ -85,7 +85,7 @@ if test "$ARTSC_CONFIG" = "no"; then
|
||||
no_artsc=yes
|
||||
else
|
||||
ARTSC_CFLAGS=`$ARTSC_CONFIG $artsc_config_args --cflags`
|
||||
- ARTSC_LIBS=`$ARTSC_CONFIG $artsc_config_args --libs`
|
||||
+ ARTSC_LIBS="`$ARTSC_CONFIG $artsc_config_args --libs` -lstdc++ -lm"
|
||||
ARTSC_VERSION=`$ARTSC_CONFIG $artsc_config_args --version`
|
||||
|
||||
ARTSC_TEST_VERSION($ARTSC_VERSION, $min_artsc_version, ,no_artsc=version)
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_aac_Makefile,v 1.2 2008/04/02 00:39:19 fgsch Exp $
|
||||
--- src/aac/Makefile.orig Wed Jan 30 03:29:49 2008
|
||||
+++ src/aac/Makefile Wed Jan 30 03:32:21 2008
|
||||
$OpenBSD: patch-src_aac_Makefile,v 1.3 2009/01/25 02:07:06 fgsch Exp $
|
||||
--- src/aac/Makefile.orig Fri May 23 23:44:19 2008
|
||||
+++ src/aac/Makefile Sun Jan 4 19:33:06 2009
|
||||
@@ -3,51 +3,7 @@ PLUGIN = aac${PLUGIN_SUFFIX}
|
||||
SRCS = libmp4.c \
|
||||
mp4_utils.c \
|
||||
@ -57,6 +57,6 @@ $OpenBSD: patch-src_aac_Makefile,v 1.2 2008/04/02 00:39:19 fgsch Exp $
|
||||
@@ -56,4 +12,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
|
||||
|
||||
CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
|
||||
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
|
||||
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm
|
||||
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
|
||||
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -lm
|
||||
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm -L$(LOCALBASE)/lib -lfaad -lmp4ff
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_aac_libmp4_c,v 1.2 2008/09/15 22:02:44 jakemsr Exp $
|
||||
--- src/aac/libmp4.c.orig Thu Mar 13 15:22:35 2008
|
||||
+++ src/aac/libmp4.c Sat Aug 30 22:22:57 2008
|
||||
@@ -91,7 +91,7 @@ static guint32 mp4_read_callback(void *data, void *buf
|
||||
$OpenBSD: patch-src_aac_libmp4_c,v 1.3 2009/01/25 02:07:06 fgsch Exp $
|
||||
--- src/aac/libmp4.c.orig Fri May 23 23:44:19 2008
|
||||
+++ src/aac/libmp4.c Sun Jan 4 19:33:06 2009
|
||||
@@ -88,7 +88,7 @@ static guint32 mp4_read_callback(void *data, void *buf
|
||||
return aud_vfs_fread(buffer, 1, len, (VFSFile *) data);
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.2 2008/09/15 22:02:44 jakemsr Exp $
|
||||
{
|
||||
if (data == NULL)
|
||||
return -1;
|
||||
@@ -629,7 +629,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
|
||||
@@ -626,7 +626,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
|
||||
faacDecHandle decoder = 0;
|
||||
guchar streambuffer[BUFFER_SIZE];
|
||||
gulong bufferconsumed = 0;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_sun_audio_c,v 1.1 2008/04/02 00:39:19 fgsch Exp $
|
||||
--- src/sun/audio.c.orig Mon Mar 31 02:47:49 2008
|
||||
+++ src/sun/audio.c Mon Mar 31 02:48:03 2008
|
||||
@@ -122,14 +122,12 @@ static void sun_setformat(AFormat fmt, int rate, int n
|
||||
$OpenBSD: patch-src_sun_audio_c,v 1.2 2009/01/25 02:07:06 fgsch Exp $
|
||||
--- src/sun/audio.c.orig Fri May 23 23:44:20 2008
|
||||
+++ src/sun/audio.c Wed Jan 21 08:29:52 2009
|
||||
@@ -121,14 +121,12 @@ static void sun_setformat(AFormat fmt, int rate, int n
|
||||
|
||||
sun = sun_format(fmt);
|
||||
|
||||
@ -16,3 +16,12 @@ $OpenBSD: patch-src_sun_audio_c,v 1.1 2008/04/02 00:39:19 fgsch Exp $
|
||||
output.frequency = rate;
|
||||
output.channels = nch;
|
||||
sun_setparams();
|
||||
@@ -473,7 +471,7 @@ int sun_open(AFormat fmt, int rate, int nch)
|
||||
|
||||
if ((audio.fd = open(audio.devaudio, O_RDWR)) < 0)
|
||||
{
|
||||
- g_error("%s: %s", audio.devaudio, strerror(errno));
|
||||
+ g_warning("%s: %s", audio.devaudio, strerror(errno));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Arts helper and plugin for Audacious.
|
||||
1
audio/audacious-plugins/pkg/DESCR-jack
Normal file
1
audio/audacious-plugins/pkg/DESCR-jack
Normal file
@ -0,0 +1 @@
|
||||
Jack plugin for Audacious.
|
||||
@ -1,2 +1 @@
|
||||
Audacious Plugins are the input, output, visualization and effect plugins
|
||||
needed for Audacious.
|
||||
Input, output, visualization and effect plugins for Audacious.
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
@comment $OpenBSD: PLIST-arts,v 1.3 2008/09/15 22:02:44 jakemsr Exp $
|
||||
@bin bin/audacious-arts-helper
|
||||
lib/audacious/Output/arts.so
|
||||
2
audio/audacious-plugins/pkg/PLIST-jack
Normal file
2
audio/audacious-plugins/pkg/PLIST-jack
Normal file
@ -0,0 +1,2 @@
|
||||
@comment $OpenBSD: PLIST-jack,v 1.1 2009/01/25 02:07:06 fgsch Exp $
|
||||
lib/audacious/Output/jackout.so
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2008/05/19 15:22:49 fgsch Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.5 2009/01/25 02:07:06 fgsch Exp $
|
||||
lib/audacious/
|
||||
lib/audacious/Container/
|
||||
lib/audacious/Container/m3u.so
|
||||
@ -6,6 +6,7 @@ lib/audacious/Container/pls.so
|
||||
lib/audacious/Container/xspf.so
|
||||
lib/audacious/Effect/
|
||||
lib/audacious/Effect/audiocompress.so
|
||||
lib/audacious/Effect/crystalizer.so
|
||||
lib/audacious/Effect/echo.so
|
||||
lib/audacious/Effect/ladspa.so
|
||||
lib/audacious/Effect/sndstretch.so
|
||||
@ -38,13 +39,12 @@ lib/audacious/Input/tonegen.so
|
||||
lib/audacious/Input/tta.so
|
||||
lib/audacious/Input/vorbis.so
|
||||
lib/audacious/Input/vtx.so
|
||||
lib/audacious/Input/wavpack.so
|
||||
lib/audacious/Input/wma.so
|
||||
lib/audacious/Output/
|
||||
lib/audacious/Output/ESD.so
|
||||
lib/audacious/Output/OSS.so
|
||||
lib/audacious/Output/filewriter.so
|
||||
lib/audacious/Output/jackout.so
|
||||
lib/audacious/Output/null.so
|
||||
lib/audacious/Output/sndio.so
|
||||
lib/audacious/Output/sun.so
|
||||
lib/audacious/Transport/
|
||||
lib/audacious/Transport/lastfm.so
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user