rpms/audacious-plugins/devel audacious-plugins-2.2-beta1-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 README, 1.2, 1.3 audacious-plugins.spec, 1.53, 1.54 sources, 1.20, 1.21 audacious-plugins-1.5.1-timidity-cfg.patch, 1.1, NONE audacious-plugins-2.1-alsa-ng.patch, 1.1, NONE audacious-plugins-2.1-pulseaudio-volume-accuracy.patch, 1.1, NONE audacious-plugins-2.1-pulseaudio-volume.patch, 1.1, NONE audacious-plugins-2.1-underruns.patch, 1.2, NONE
Michael Schwendt
mschwendt at fedoraproject.org
Thu Oct 22 15:50:04 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15520
Modified Files:
.cvsignore README audacious-plugins.spec sources
Added Files:
audacious-plugins-2.2-beta1-pulseaudio.patch
Removed Files:
audacious-plugins-1.5.1-timidity-cfg.patch
audacious-plugins-2.1-alsa-ng.patch
audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
audacious-plugins-2.1-pulseaudio-volume.patch
audacious-plugins-2.1-underruns.patch
Log Message:
* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
- Upgrade to 2.2-beta1
- Backport old pulse_audio plugin from Audacious 2.1
and patch it to fix volume issues.
audacious-plugins-2.2-beta1-pulseaudio.patch:
configure | 2
src/pulse_audio/Makefile | 12
src/pulse_audio/pulse_audio.c | 786 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 799 insertions(+), 1 deletion(-)
--- NEW FILE audacious-plugins-2.2-beta1-pulseaudio.patch ---
"pulse_audio" plugin updated for Audacious 2.2
Michael Schwendt <mschwendt at users.sf.net>
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/configure audacious-plugins-fedora-2.2-beta1/configure
--- audacious-plugins-fedora-2.2-beta1-orig/configure 2009-10-20 23:37:27.000000000 +0200
+++ audacious-plugins-fedora-2.2-beta1/configure 2009-10-22 13:18:45.400508540 +0200
@@ -7483,7 +7483,7 @@
INPUT_PLUGINS="tonegen console psf xsf metronom vtx"
-OUTPUT_PLUGINS="crossfade null"
+OUTPUT_PLUGINS="crossfade null pulse_audio"
EFFECT_PLUGINS="audiocompress crystalizer ladspa voice_removal sndstretch stereo_plugin echo_plugin"
GENERAL_PLUGINS="song_change alarm skins vfstrace gtkui"
VISUALIZATION_PLUGINS="blur_scope spectrum"
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile
--- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile 2009-07-07 00:40:36.000000000 +0200
@@ -0,0 +1,12 @@
+PLUGIN = pulse_audio${PLUGIN_SUFFIX}
+
+SRCS = pulse_audio.c
+
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
+
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} -I../..
+LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS}
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c 1970-01-01 01:00:00.000000000 +0100
+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c 2009-10-22 17:26:53.215617316 +0200
@@ -0,0 +1,786 @@
+/***
+ This file is part of xmms-pulse.
+
+ xmms-pulse is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ xmms-pulse is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with xmms-pulse; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA.
+***/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#include <gtk/gtk.h>
+#include <audacious/plugin.h>
+#include <audacious/i18n.h>
+
+#include <pulse/pulseaudio.h>
+
+static pa_context *context = NULL;
+static pa_stream *stream = NULL;
+static pa_threaded_mainloop *mainloop = NULL;
+
+static pa_cvolume volume;
+static int volume_valid = 0;
+
+static int do_trigger = 0;
+static uint64_t written = 0;
+static int time_offset_msec = 0;
+static int just_flushed = 0;
+
+static int connected = 0;
+
+static pa_time_event *volume_time_event = NULL;
+
+#define CHECK_DEAD_GOTO(label, warn) do { \
+if (!mainloop || \
+ !context || pa_context_get_state(context) != PA_CONTEXT_READY || \
+ !stream || pa_stream_get_state(stream) != PA_STREAM_READY) { \
+ if (warn) \
+ AUDDBG("Connection died: %s", context ? pa_strerror(pa_context_errno(context)) : "NULL"); \
+ goto label; \
+ } \
+} while(0);
+
+#define CHECK_CONNECTED(retval) \
+do { \
+ if (!connected) return retval; \
+} while (0);
+
+static const char* get_song_name(void) {
+ static char t[256];
+ gint pos;
+ char *str, *u;
+ gint playlist = aud_playlist_get_active();
+
+ if (!(str = aud_playlist_get_title(playlist)))
+ return "Playback Stream";
+ snprintf(t, sizeof(t), "%s", u = pa_locale_to_utf8(str));
+ pa_xfree(u);
+
+ return t;
+}
+
+static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+ assert(c);
+
+ if (!i)
+ return;
+
+ volume = i->volume;
+ volume_valid = 1;
+}
+
+static void subscribe_cb(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata) {
+ pa_operation *o;
+
+ assert(c);
+
+ if (!stream ||
+ index != pa_stream_get_index(stream) ||
+ (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE) &&
+ t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW)))
+ return;
+
+ if (!(o = pa_context_get_sink_input_info(c, index, info_cb, NULL))) {
+ AUDDBG("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(c)));
+ return;
+ }
+
+ pa_operation_unref(o);
+}
+
+static void context_state_cb(pa_context *c, void *userdata) {
+ assert(c);
+
+ switch (pa_context_get_state(c)) {
+ case PA_CONTEXT_READY:
+ case PA_CONTEXT_TERMINATED:
+ case PA_CONTEXT_FAILED:
+ pa_threaded_mainloop_signal(mainloop, 0);
+ break;
+
+ case PA_CONTEXT_UNCONNECTED:
+ case PA_CONTEXT_CONNECTING:
+ case PA_CONTEXT_AUTHORIZING:
+ case PA_CONTEXT_SETTING_NAME:
+ break;
+ }
+}
+
+static void stream_state_cb(pa_stream *s, void * userdata) {
+ assert(s);
+
+ switch (pa_stream_get_state(s)) {
+
+ case PA_STREAM_READY:
+ case PA_STREAM_FAILED:
+ case PA_STREAM_TERMINATED:
+ pa_threaded_mainloop_signal(mainloop, 0);
+ break;
+
+ case PA_STREAM_UNCONNECTED:
+ case PA_STREAM_CREATING:
+ break;
+ }
+}
+
+static void stream_success_cb(pa_stream *s, int success, void *userdata) {
+ assert(s);
+
+ if (userdata)
+ *(int*) userdata = success;
+
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void context_success_cb(pa_context *c, int success, void *userdata) {
+ assert(c);
+
+ if (userdata)
+ *(int*) userdata = success;
+
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
+ assert(s);
+
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void stream_latency_update_cb(pa_stream *s, void *userdata) {
+ assert(s);
+
+ pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void pulse_get_volume(int *l, int *r) {
+ pa_cvolume v;
+ int b = 0;
+
+ *l = *r = 100;
+
+ if (connected) {
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+
+ v = volume;
+ b = volume_valid;
+
+ fail:
+ pa_threaded_mainloop_unlock(mainloop);
+ } else {
+ v = volume;
+ b = volume_valid;
+ }
+
+ if (b) {
+ if (v.channels == 2) {
+ *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
+ *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+ } else
+ *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
+ }
+}
+
+static void volume_time_cb(pa_mainloop_api *api, pa_time_event *e, const struct timeval *tv, void *userdata) {
+ pa_operation *o;
+
+ if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL)))
+ AUDDBG("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+ else
+ pa_operation_unref(o);
+
+ /* We don't wait for completion of this command */
+
+ api->time_free(volume_time_event);
+ volume_time_event = NULL;
+}
+
+static void pulse_set_volume(int l, int r) {
+
+ if (connected) {
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+ }
+
+ if (!volume_valid || volume.channels != 1) {
+ volume.values[0] = ((pa_volume_t) l * PA_VOLUME_NORM)/100;
+ volume.values[1] = ((pa_volume_t) r * PA_VOLUME_NORM)/100;
+ volume.channels = 2;
+ } else {
+ volume.values[0] = ((pa_volume_t) l * PA_VOLUME_NORM)/100;
+ volume.channels = 1;
+ }
+
+ volume_valid = 1;
+
+ if (connected && !volume_time_event) {
+ struct timeval tv;
+ pa_mainloop_api *api = pa_threaded_mainloop_get_api(mainloop);
+ volume_time_event = api->time_new(api, pa_timeval_add(pa_gettimeofday(&tv), 100000), volume_time_cb, NULL);
+ }
+
+fail:
+ if (connected)
+ pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void pulse_pause(short b) {
+ pa_operation *o = NULL;
+ int success = 0;
+
+ CHECK_CONNECTED();
+
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+
+ if (!(o = pa_stream_cork(stream, b, stream_success_cb, &success))) {
+ AUDDBG("pa_stream_cork() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+
+ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+ CHECK_DEAD_GOTO(fail, 1);
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ if (!success)
+ AUDDBG("pa_stream_cork() failed: %s", pa_strerror(pa_context_errno(context)));
+
+fail:
+
+ if (o)
+ pa_operation_unref(o);
+
+ pa_threaded_mainloop_unlock(mainloop);
+}
+
+static int pulse_free(void) {
+ size_t l = 0;
+ pa_operation *o = NULL;
+
+ CHECK_CONNECTED(0);
+
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+
+ if ((l = pa_stream_writable_size(stream)) == (size_t) -1) {
+ AUDDBG("pa_stream_writable_size() failed: %s", pa_strerror(pa_context_errno(context)));
+ l = 0;
+ goto fail;
+ }
+
+ /* If this function is called twice with no pulse_write() call in
+ * between this means we should trigger the playback */
+ if (do_trigger) {
+ int success = 0;
+
+ if (!(o = pa_stream_trigger(stream, stream_success_cb, &success))) {
+ AUDDBG("pa_stream_trigger() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+
+ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+ CHECK_DEAD_GOTO(fail, 1);
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ if (!success)
+ AUDDBG("pa_stream_trigger() failed: %s", pa_strerror(pa_context_errno(context)));
+ }
+
+fail:
+ if (o)
+ pa_operation_unref(o);
+
+ pa_threaded_mainloop_unlock(mainloop);
+
+ do_trigger = !!l;
+ return (int) l;
+}
+
+static int pulse_get_written_time(void) {
+ int r = 0;
+
+ CHECK_CONNECTED(0);
+
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+
+ r = (int) (((double) written*1000) / pa_bytes_per_second(pa_stream_get_sample_spec(stream)));
+
+fail:
+ pa_threaded_mainloop_unlock(mainloop);
+
+ return r;
+}
+
+static int pulse_get_output_time(void) {
+ int r = 0;
+ pa_usec_t t;
+
+ CHECK_CONNECTED(0);
+
+ pa_threaded_mainloop_lock(mainloop);
+
+ for (;;) {
+ CHECK_DEAD_GOTO(fail, 1);
+
+ if (pa_stream_get_time(stream, &t) >= 0)
+ break;
+
+ if (pa_context_errno(context) != PA_ERR_NODATA) {
+ AUDDBG("pa_stream_get_time() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ r = (int) (t / 1000);
+
+ if (just_flushed) {
+ time_offset_msec -= r;
+ just_flushed = 0;
+ }
+
+ r += time_offset_msec;
+
+fail:
+ pa_threaded_mainloop_unlock(mainloop);
+
+ return r;
+}
+
+static int pulse_playing(void) {
+ int r = 0;
+ const pa_timing_info *i;
+
+ CHECK_CONNECTED(0);
+
+ pa_threaded_mainloop_lock(mainloop);
+
+ for (;;) {
+ CHECK_DEAD_GOTO(fail, 1);
+
+ if ((i = pa_stream_get_timing_info(stream)))
+ break;
+
+ if (pa_context_errno(context) != PA_ERR_NODATA) {
+ AUDDBG("pa_stream_get_timing_info() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ r = i->playing;
+
+fail:
+ pa_threaded_mainloop_unlock(mainloop);
+
+ return r;
+}
+
+static void pulse_flush(int time) {
+ pa_operation *o = NULL;
+ int success = 0;
+
+ CHECK_CONNECTED();
+
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+
+ /* gapless playback: new stream, reset the title. --nenolod */
+ if (time == 0) {
+ pa_stream_set_name(stream, get_song_name(), stream_success_cb, &success);
+ }
+
+ if (!(o = pa_stream_flush(stream, stream_success_cb, &success))) {
+ AUDDBG("pa_stream_flush() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+
+ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+ CHECK_DEAD_GOTO(fail, 1);
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ if (!success)
+ AUDDBG("pa_stream_flush() failed: %s", pa_strerror(pa_context_errno(context)));
+
+ written = (uint64_t) (((double) time * pa_bytes_per_second(pa_stream_get_sample_spec(stream))) / 1000);
+ just_flushed = 1;
+ time_offset_msec = time;
+
+fail:
+ if (o)
+ pa_operation_unref(o);
+
+ pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void pulse_write(void* ptr, int length) {
+ gint writeoffs, remain, writable;
+
+ CHECK_CONNECTED();
+
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 1);
+
+ /* break large fragments into smaller fragments. --nenolod */
+ for (writeoffs = 0, remain = length;
+ writeoffs < length;
+ writeoffs += writable, remain -= writable)
+ {
+ gpointer pptr = ptr + writeoffs;
+
+ writable = length - writeoffs;
+ size_t fragsize = pa_stream_writable_size(stream);
+
+ /* don't write more than what PA is willing to handle right now. */
+ if (writable > fragsize)
+ writable = fragsize;
+
+ if (pa_stream_write(stream, pptr, writable, NULL, PA_SEEK_RELATIVE, 0) < 0) {
+ AUDDBG("pa_stream_write() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+ }
+
+ do_trigger = 0;
+ written += length;
+
+fail:
+ pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void drain(void) {
+ pa_operation *o = NULL;
+ int success = 0;
+
+ CHECK_CONNECTED();
+
+ pa_threaded_mainloop_lock(mainloop);
+ CHECK_DEAD_GOTO(fail, 0);
+
+ if (!(o = pa_stream_drain(stream, stream_success_cb, &success))) {
+ AUDDBG("pa_stream_drain() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto fail;
+ }
+
+ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+ CHECK_DEAD_GOTO(fail, 1);
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ if (!success)
+ AUDDBG("pa_stream_drain() failed: %s", pa_strerror(pa_context_errno(context)));
+
+fail:
+ if (o)
+ pa_operation_unref(o);
+
+ pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void pulse_close(void)
+{
+ drain();
+
+ connected = 0;
+
+ if (mainloop)
+ pa_threaded_mainloop_stop(mainloop);
+
+ if (stream) {
+ pa_stream_disconnect(stream);
+ pa_stream_unref(stream);
+ stream = NULL;
+ }
+
+ if (context) {
+ pa_context_disconnect(context);
+ pa_context_unref(context);
+ context = NULL;
+ }
+
+ if (mainloop) {
+ pa_threaded_mainloop_free(mainloop);
+ mainloop = NULL;
+ }
+
+ volume_time_event = NULL;
+}
+
+static OutputPluginInitStatus pulse_init(void) {
+ pa_sample_spec ss;
+
+ g_assert(!mainloop);
+ g_assert(!context);
+ g_assert(!stream);
+ g_assert(!connected);
+
+ ss.format = PA_SAMPLE_S16NE;
+ ss.rate = 44100;
+ ss.channels = 2;
+
+ if (!pa_sample_spec_valid(&ss))
+ return OUTPUT_PLUGIN_INIT_FAIL;
+
+ if (!(mainloop = pa_threaded_mainloop_new())) {
+ pulse_close();
+ return OUTPUT_PLUGIN_INIT_FAIL;
+ }
+
+ pulse_close();
+ return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;
+}
+
+static int pulse_open(AFormat fmt, int rate, int nch) {
+ pa_sample_spec ss;
+ pa_operation *o = NULL;
+ int success;
+
+ g_assert(!mainloop);
+ g_assert(!context);
+ g_assert(!stream);
+ g_assert(!connected);
+
+ switch(fmt)
+ {
+ case FMT_U8:
+ ss.format = PA_SAMPLE_U8;
+ break;
+ case FMT_S16_LE:
+ ss.format = PA_SAMPLE_S16LE;
+ break;
+ case FMT_S16_BE:
+ ss.format = PA_SAMPLE_S16BE;
+ break;
+ case FMT_S16_NE:
+ ss.format = PA_SAMPLE_S16NE;
+ break;
+#if 0 /* pulseaudio only handles 16 and 32bit formats*/
+ case FMT_S24_LE:
+ ss.format = PA_SAMPLE_S24LE;
+ break;
+ case FMT_S24_BE:
+ ss.format = PA_SAMPLE_S24BE;
+ break;
+ case FMT_S24_NE:
+ ss.format = PA_SAMPLE_S24NE;
+ break;
+#endif
+ case FMT_S32_LE:
+ ss.format = PA_SAMPLE_S32LE;
+ break;
+ case FMT_S32_BE:
+ ss.format = PA_SAMPLE_S32BE;
+ break;
+ case FMT_S32_NE:
+ ss.format = PA_SAMPLE_S32NE;
+ break;
+ case FMT_FLOAT:
+ ss.format = PA_SAMPLE_FLOAT32NE;
+ break;
+ default:
+ return FALSE;
+ }
+ ss.rate = rate;
+ ss.channels = nch;
+
+ if (!pa_sample_spec_valid(&ss))
+ return FALSE;
+
+ if (!(mainloop = pa_threaded_mainloop_new())) {
+ AUDDBG("Failed to allocate main loop");
+ goto fail;
+ }
+
+ pa_threaded_mainloop_lock(mainloop);
+
+ if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), "Audacious"))) {
+ AUDDBG("Failed to allocate context");
+ goto unlock_and_fail;
+ }
+
+ pa_context_set_state_callback(context, context_state_cb, NULL);
+ pa_context_set_subscribe_callback(context, subscribe_cb, NULL);
+
+ if (pa_context_connect(context, NULL, 0, NULL) < 0) {
+ AUDDBG("Failed to connect to server: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ if (pa_threaded_mainloop_start(mainloop) < 0) {
+ AUDDBG("Failed to start main loop");
+ goto unlock_and_fail;
+ }
+
+ /* Wait until the context is ready */
+ pa_threaded_mainloop_wait(mainloop);
+
+ if (pa_context_get_state(context) != PA_CONTEXT_READY) {
+ AUDDBG("Failed to connect to server: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ if (!(stream = pa_stream_new(context, get_song_name(), &ss, NULL))) {
+ AUDDBG("Failed to create stream: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ pa_stream_set_state_callback(stream, stream_state_cb, NULL);
+ pa_stream_set_write_callback(stream, stream_request_cb, NULL);
+ pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL);
+
+ /* Connect stream with sink and default volume */
+ if (pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
+ AUDDBG("Failed to connect stream: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ /* Wait until the stream is ready */
+ pa_threaded_mainloop_wait(mainloop);
+
+ if (pa_stream_get_state(stream) != PA_STREAM_READY) {
+ AUDDBG("Failed to connect stream: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ /* Now subscribe to events */
+ if (!(o = pa_context_subscribe(context, PA_SUBSCRIPTION_MASK_SINK_INPUT, context_success_cb, &success))) {
+ AUDDBG("pa_context_subscribe() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ success = 0;
+ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+ CHECK_DEAD_GOTO(fail, 1);
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ if (!success) {
+ AUDDBG("pa_context_subscribe() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ pa_operation_unref(o);
+
+ /* Now request the initial stream info */
+ if (!(o = pa_context_get_sink_input_info(context, pa_stream_get_index(stream), info_cb, NULL))) {
+ AUDDBG("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+
+ while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+ CHECK_DEAD_GOTO(fail, 1);
+ pa_threaded_mainloop_wait(mainloop);
+ }
+
+ if (!volume_valid) {
+ AUDDBG("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(context)));
+ goto unlock_and_fail;
+ }
+ pa_operation_unref(o);
+
+ do_trigger = 0;
+ written = 0;
+ time_offset_msec = 0;
+ just_flushed = 0;
+ connected = 1;
+ volume_time_event = NULL;
+
+ pa_threaded_mainloop_unlock(mainloop);
+
+ return TRUE;
+
+unlock_and_fail:
+
+ if (o)
+ pa_operation_unref(o);
+
+ pa_threaded_mainloop_unlock(mainloop);
+
+fail:
+
+ pulse_close();
+
+ return FALSE;
+}
+
+static void pulse_about(void) {
+ static GtkWidget *dialog;
+
+ if (dialog != NULL)
+ return;
+
+ dialog = audacious_info_dialog(
+ _("About Audacious PulseAudio Output Plugin"),
+ _("Audacious PulseAudio Output Plugin\n\n "
+ "This program is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+ "the Free Software Foundation; either version 2 of the License, or\n"
+ "(at your option) any later version.\n"
+ "\n"
+ "This program is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ "GNU General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU General Public License\n"
+ "along with this program; if not, write to the Free Software\n"
+ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+ "USA."),
+ _("OK"),
+ FALSE,
+ NULL,
+ NULL);
+
+ gtk_signal_connect(
+ GTK_OBJECT(dialog),
+ "destroy",
+ GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+ &dialog);
+}
+
+static OutputPlugin pulse_op = {
+ .description = "PulseAudio Output Plugin",
+ .probe_priority = 8,
+ .init = pulse_init,
+ .about = pulse_about,
+ .get_volume = pulse_get_volume,
+ .set_volume = pulse_set_volume,
+ .open_audio = pulse_open,
+ .write_audio = pulse_write,
+ .close_audio = pulse_close,
+ .flush = pulse_flush,
+ .pause = pulse_pause,
+ .buffer_free = pulse_free,
+ .buffer_playing = pulse_playing,
+ .output_time = pulse_get_output_time,
+ .written_time = pulse_get_written_time,
+};
+
+OutputPlugin *pulse_oplist[] = { &pulse_op, NULL };
+
+SIMPLE_OUTPUT_PLUGIN(pulser, pulse_oplist);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 14 Jul 2009 17:24:08 -0000 1.19
+++ .cvsignore 22 Oct 2009 15:50:03 -0000 1.20
@@ -1 +1 @@
-audacious-plugins-fedora-2.1.tar.bz2
+audacious-plugins-fedora-2.2-beta1.tar.bz2
Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README 21 Sep 2009 10:31:43 -0000 1.2
+++ README 22 Oct 2009 15:50:03 -0000 1.3
@@ -1,3 +1,15 @@
+2.2-beta1 removes alsa-ng plugin. The only remaining choice, alsa-gapless,
+fails to initialise with alsa-plugins-pulseaudio + pulseaudio.
+
+[...]
+
+Audacious 2.2-alpha2 defaults to alsa-ng output plugin, which fails
+to work with PulseAudio (F-11). Switching to the only other choice, the
+experimental alsa-gapless plugin, doesn't work either. There is no
+pulseaudio plugin anymore.
+
+[...]
+
2009-09-20:
With alsa-gapless output plugin in 2.2-alpha1 on Fedora 11 the poll()
playback freezes have returned for me.
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- audacious-plugins.spec 21 Oct 2009 20:58:19 -0000 1.53
+++ audacious-plugins.spec 22 Oct 2009 15:50:04 -0000 1.54
@@ -1,11 +1,11 @@
# Minimum audacious/audacious-plugins version in inter-package
# dependencies.
-# We need 2.1 as 2.0.1 is insufficient.
-%define aud_ver 2.1
+# We need 2.2 as 2.1 is insufficient.
+%define aud_ver 2.2
Name: audacious-plugins
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.2
+Release: 0.1.beta1%{?dist}
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
@@ -19,15 +19,11 @@ License: GPLv2 and GPLv2+ and LGPLv2+ an
# Removed: aac alc demac tta wma
# Not removed (no codec included): madplug mms
# Disabled via options where possible, see %%build.
-Source0: audacious-plugins-fedora-%{version}.tar.bz2
+Source0: audacious-plugins-fedora-%{version}-beta1.tar.bz2
#Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
-Patch1: audacious-plugins-1.5.1-timidity-cfg.patch
Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
-Patch3: audacious-plugins-2.1-alsa-ng.patch
-Patch4: audacious-plugins-2.1-underruns.patch
-Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
-Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
+Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
BuildRequires: audacious-devel >= %{aud_ver}
BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -146,14 +142,11 @@ vortex compressed files.
%prep
-%setup -q -n audacious-plugins-fedora-%{version}
+#setup -q -n audacious-plugins-fedora-%{version}
+%setup -q -n audacious-plugins-fedora-%{version}-beta1
-%patch1 -p1 -b .timidity-cfg
%patch2 -p1 -b .xmms-skindir
-%patch3 -p1 -b .alsa-ng
-%patch4 -p1 -b .underruns
-%patch5 -p1 -b .pulseaudio-volume
-%patch6 -p1 -b .pulseaudio-volume-accuracy
+%patch3 -p1 -b .add-pulseaudio
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -166,11 +159,10 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
--enable-neon \
\
--disable-aac \
- --disable-ape \
+ --disable-ffaudio \
--disable-mp3 \
--disable-mms \
--disable-tta \
- --disable-wma \
--disable-libmadtest \
\
--disable-oss \
@@ -237,6 +229,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
+- Upgrade to 2.2-beta1
+- Backport old pulse_audio plugin from Audacious 2.1
+ and patch it to fix volume issues.
+
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-7
- Patch pulseaudio plugin to not suffer from precision loss when
calculating the volume level to save.
@@ -248,6 +245,14 @@ rm -rf $RPM_BUILD_ROOT
- Patch pulseaudio plugin to not get confused by volume values passed
in via callback.
+* Sun Oct 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha2
+- Upgrade to 2.2-alpha2 (breaks ALSA output with alsa-plugins-pulseaudio!)
+
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha1
+- Upgrade to 2.2-alpha1 (primarly for alsa-gapless output plugin).
+- Removes pulse_audio output plugin!
+- Obsolete patches: timidity-cfg, keep-mixer-open
+
* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
- Patch alsa-ng plugin with some buffer prefilling to fight underruns.
- Merge minor changes from 2.2-alpha1 alsa-ng plugin.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources 14 Jul 2009 17:24:08 -0000 1.20
+++ sources 22 Oct 2009 15:50:04 -0000 1.21
@@ -1 +1 @@
-199dfef2aa2020f0405d54b67e6540f7 audacious-plugins-fedora-2.1.tar.bz2
+97dff09ad6a5735cb5d42a5e4b26fee6 audacious-plugins-fedora-2.2-beta1.tar.bz2
--- audacious-plugins-1.5.1-timidity-cfg.patch DELETED ---
--- audacious-plugins-2.1-alsa-ng.patch DELETED ---
--- audacious-plugins-2.1-pulseaudio-volume-accuracy.patch DELETED ---
--- audacious-plugins-2.1-pulseaudio-volume.patch DELETED ---
--- audacious-plugins-2.1-underruns.patch DELETED ---
More information about the fedora-extras-commits
mailing list