diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2003-10-03 17:39:43 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2003-10-03 17:39:43 +0000 |
| commit | 8771a2e57a68a06ba661d14fb329ed5793c77869 (patch) | |
| tree | c75311df6aeece83a6f17a0ead34bd1e9370f09c /src | |
| parent | 5239910f66e15ff457f5c4a6b6b6f839bd3f1528 (diff) | |
| download | xine-lib-8771a2e57a68a06ba661d14fb329ed5793c77869.tar.gz xine-lib-8771a2e57a68a06ba661d14fb329ed5793c77869.tar.bz2 | |
Let the sound driver do the locking for mixer volume, instead of audio_out engine.
CVS patchset: 5429
CVS date: 2003/10/03 17:39:43
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/audio_out.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index a612360b1..c7b973cb3 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.145 2003/09/13 16:15:38 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.146 2003/10/03 17:39:43 jcdutton Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -1635,9 +1635,8 @@ static int ao_set_property (xine_audio_port_t *this_gen, int property, int value default: if (!this->grab_only) { - pthread_mutex_lock( &this->driver_lock ); + /* Let the sound driver lock it's own mixer */ ret = this->driver->set_property(this->driver, property, value); - pthread_mutex_unlock( &this->driver_lock ); } else ret = 0; } |