59 lines
2.6 KiB
Plaintext
59 lines
2.6 KiB
Plaintext
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.11 2010/03/21 01:41:15 sthen Exp $
|
|
--- src/xine-engine/audio_out.c.orig Tue Feb 23 16:59:05 2010
|
|
+++ src/xine-engine/audio_out.c Tue Feb 23 19:29:39 2010
|
|
@@ -1089,7 +1089,7 @@ static void *ao_loop (void *this_gen) {
|
|
in_buf->format.rate,
|
|
in_buf->format.mode) == 0 ) {
|
|
in_buf->stream->emergency_brake = 1;
|
|
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
}
|
|
}
|
|
}
|
|
@@ -1120,7 +1120,7 @@ static void *ao_loop (void *this_gen) {
|
|
stream = xine_list_get_value (this->streams, ite);
|
|
if( !stream->emergency_brake ) {
|
|
stream->emergency_brake = 1;
|
|
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&this->streams_lock);
|
|
@@ -1252,7 +1252,7 @@ static void *ao_loop (void *this_gen) {
|
|
if( result < 0 ) {
|
|
/* device unplugged. */
|
|
xprintf(this->xine, XINE_VERBOSITY_LOG, _("write to sound card failed. Assuming the device was unplugged.\n"));
|
|
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
|
|
pthread_mutex_lock( &this->driver_lock );
|
|
if(this->driver_open) {
|
|
@@ -1266,7 +1266,7 @@ static void *ao_loop (void *this_gen) {
|
|
in_buf->format.rate,
|
|
in_buf->format.mode) == 0) {
|
|
in_buf->stream->emergency_brake = 1;
|
|
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
}
|
|
}
|
|
pthread_mutex_unlock( &this->driver_lock );
|
|
@@ -1514,7 +1514,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
|
|
|
|
if( !ret ) {
|
|
stream->emergency_brake = 1;
|
|
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
return 0;
|
|
}
|
|
} else {
|
|
@@ -2284,7 +2284,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
|
|
this->audio_loop_running = 1;
|
|
|
|
pthread_attr_init(&pth_attrs);
|
|
+#if !defined(__OpenBSD__)
|
|
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
|
|
+#endif
|
|
|
|
this->audio_thread_created = 1;
|
|
if ((err = pthread_create (&this->audio_thread,
|