[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/phonon-xine
From: Benjamin Reed <ranger () befunk ! com>
Date: 2007-06-30 23:22:04
Message-ID: 1183245724.848156.5064.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 681955 by reed:
fix with xine's macosx branch
M +2 -1 bytestreamplugin.cpp
--- trunk/KDE/kdemultimedia/phonon-xine/bytestreamplugin.cpp #681954:681955
@@ -63,7 +63,8 @@
return INPUT_CAP_PREVIEW | (that->bytestream->streamSeekable() ? \
INPUT_CAP_SEEKABLE : 0); }
-#if ((XINE_SUB_VERSION >= 90 && XINE_MINOR_VERSION == 1) || \
(XINE_MINOR_VERSION > 1) && XINE_MAJOR_VERSION == 1) || XINE_MAJOR_VERSION \
> 1 +/* remove the !__APPLE__ junk once the osx xine stuff is merged back \
> into xine 1.2 proper */
+#if ((XINE_SUB_VERSION >= 90 && XINE_MINOR_VERSION == 1 && !__APPLE__) || \
(XINE_MINOR_VERSION > 1) && XINE_MAJOR_VERSION == 1) || XINE_MAJOR_VERSION \
> 1 static off_t kbytestream_plugin_read (input_plugin_t *this_gen, void \
> *buf, off_t len) {
#else
static off_t kbytestream_plugin_read (input_plugin_t *this_gen, char *buf, \
off_t len) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic