summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-11-17 01:03:28 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-11-17 01:03:28 +0000
commitf9cdfa9d671322426c36978a2a19a2ef6d61e443 (patch)
tree64025618dc12f8813bb10a06cd5b0111d0938d0d
parentaddcfbf1c87b94efda1b94c83874a66d2751019d (diff)
downloadxine-lib-f9cdfa9d671322426c36978a2a19a2ef6d61e443.tar.gz
xine-lib-f9cdfa9d671322426c36978a2a19a2ef6d61e443.tar.bz2
mind the volume :)
CVS patchset: 7129 CVS date: 2004/11/17 01:03:28
-rw-r--r--src/audio_out/audio_polyp_out.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/audio_out/audio_polyp_out.c b/src/audio_out/audio_polyp_out.c
index a522f59ed..78410dd0d 100644
--- a/src/audio_out/audio_polyp_out.c
+++ b/src/audio_out/audio_polyp_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_polyp_out.c,v 1.1 2004/11/15 03:58:55 miguelfreitas Exp $
+ * $Id: audio_polyp_out.c,v 1.2 2004/11/17 01:03:28 miguelfreitas Exp $
*
* ao plugin for polypaudio:
* http://0pointer.de/lennart/projects/polypaudio/
@@ -217,6 +217,9 @@ static int ao_polyp_open(ao_driver_t *this_gen,
pa_strerror(pa_context_errno(this->context)));
goto fail;
}
+ wait_for_operation(this,
+ pa_context_set_sink_input_volume(this->context, pa_stream_get_index(this->stream),
+ this->volume, NULL, NULL));
pthread_mutex_unlock(&this->lock);
this->frames_written = 0;
@@ -395,10 +398,11 @@ static int ao_polyp_set_property (ao_driver_t *this_gen, int property, int value
case AO_PROP_PCM_VOL:
case AO_PROP_MIXER_VOL:
pthread_mutex_lock(&this->lock);
+ this->volume = pa_volume_from_user((double)value/100);
if( this->stream && this->context )
wait_for_operation(this,
pa_context_set_sink_input_volume(this->context, pa_stream_get_index(this->stream),
- pa_volume_from_user((double)value/100), NULL, NULL));
+ this->volume, NULL, NULL));
pthread_mutex_unlock(&this->lock);
break;
case AO_PROP_MUTE_VOL: