summaryrefslogtreecommitdiff
path: root/src/libw32dll
diff options
context:
space:
mode:
Diffstat (limited to 'src/libw32dll')
-rw-r--r--src/libw32dll/qt_decoder.c6
-rw-r--r--src/libw32dll/w32codec.c4
-rw-r--r--src/libw32dll/wine/registry.c4
3 files changed, 9 insertions, 5 deletions
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index b1f9c0851..d75ef67fc 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.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: qt_decoder.c,v 1.22 2003/10/23 20:12:34 mroi Exp $
+ * $Id: qt_decoder.c,v 1.23 2003/11/11 18:44:55 f1rmb Exp $
*
* quicktime video/audio decoder plugin, using win32 dlls
* most of this code comes directly from MPlayer
@@ -242,7 +242,7 @@ static void qta_init_driver (qta_decoder_t *this, buf_element_t *buf) {
if (this->qtml_dll == NULL ) {
printf ("qt_audio: failed to load dll\n" );
pthread_mutex_unlock(&win32_codec_mutex);
- xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR,
+ _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR,
"qtmlClient.dll", NULL);
return;
}
@@ -818,7 +818,7 @@ static void qtv_init_driver (qtv_decoder_t *this, buf_element_t *buf) {
if (this->qtml_dll == NULL ) {
printf ("qt_video: failed to load dll\n" );
pthread_mutex_unlock(&win32_codec_mutex);
- xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR,
+ _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR,
"qtmlClient.dll", NULL);
return;
}
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 7c5f021e9..464d6c1c2 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.127 2003/10/23 20:12:34 mroi Exp $
+ * $Id: w32codec.c,v 1.128 2003/11/11 18:44:55 f1rmb Exp $
*
* routines for using w32 codecs
* DirectShow support by Miguel Freitas (Nov/2001)
@@ -740,7 +740,7 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
"w32codec: decoder failed to start. Is '%s' installed?\n",
win32_codec_name );
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 0;
- xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR,
+ _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR,
win32_codec_name, NULL);
}
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index e262f79c8..7be9eab54 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -15,6 +15,10 @@
#include "ext.h"
#include "registry.h"
+#ifdef XINE_MAJOR
+#include "xineutils.h"
+#endif
+
//#undef TRACE
//#define TRACE printf