diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-12 03:05:33 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-12 03:05:33 +0000 |
commit | 8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29 (patch) | |
tree | 96f97a7a8bc898ff7036c3a0c8ec366530c059b2 /src/xine-engine | |
parent | 258ff7f5eef3a0813f04c4c78f28f50fb601bef7 (diff) | |
parent | d6e3f2809541eb3b0753222a582d30bc13c31b55 (diff) | |
download | xine-lib-8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29.tar.gz xine-lib-8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29.tar.bz2 |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'src/xine-engine')
-rw-r--r-- | src/xine-engine/audio_out.c | 2 | ||||
-rw-r--r-- | src/xine-engine/broadcaster.c | 2 | ||||
-rw-r--r-- | src/xine-engine/events.c | 2 | ||||
-rw-r--r-- | src/xine-engine/video_out.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index c9daa4e4e..3a11aa238 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -2287,7 +2287,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, if ((err = pthread_create (&this->audio_thread, &pth_attrs, ao_loop, this)) != 0) { - xprintf (this->xine, XINE_VERBOSITY_DEBUG, + xprintf (this->xine, XINE_VERBOSITY_NONE, "audio_out: can't create thread (%s)\n", strerror(err)); xprintf (this->xine, XINE_VERBOSITY_LOG, _("audio_out: sorry, this should not happen. please restart xine.\n")); diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 24f2ef636..f5ac0156f 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -344,7 +344,7 @@ broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port) this->running = 1; if ((err = pthread_create (&this->manager_thread, NULL, manager_loop, (void *)this)) != 0) { - xprintf (stream->xine, XINE_VERBOSITY_DEBUG, + xprintf (stream->xine, XINE_VERBOSITY_NONE, "broadcaster: can't create new thread (%s)\n", strerror(err)); _x_abort(); } diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c index 3c2c28f6d..33d9988be 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.c @@ -244,7 +244,7 @@ void xine_event_create_listener_thread (xine_event_queue_t *queue, if ((err = pthread_create (queue->listener_thread, NULL, listener_loop, queue)) != 0) { - xprintf (queue->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf (queue->stream->xine, XINE_VERBOSITY_NONE, "events: can't create new thread (%s)\n", strerror(err)); _x_abort(); } diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 59975bab0..0c593b9d9 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -1958,7 +1958,7 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabon if ((err = pthread_create (&this->video_thread, &pth_attrs, video_out_loop, this)) != 0) { - xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out: can't create thread (%s)\n", strerror(err)); + xprintf (this->xine, XINE_VERBOSITY_NONE, "video_out: can't create thread (%s)\n", strerror(err)); /* FIXME: how does this happen ? */ xprintf (this->xine, XINE_VERBOSITY_LOG, _("video_out: sorry, this should not happen. please restart xine.\n")); |