[MPlayer-cvslog] r34440 - in trunk: configure sub/subreader.c

[reimar]

Author: reimar
Date: Sun Dec 11 22:32:07 2011
New Revision: 34440

Log:
Require a fribidi version that defines FriBidiParType.
The workarounds to work with older versions would be getting too ugly.

Modified:
   trunk/configure
   trunk/sub/subreader.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Dec 11 19:47:40 2011	(r34439)
+++ trunk/configure	Sun Dec 11 22:32:07 2011	(r34440)
@@ -5934,9 +5934,8 @@ echocheck "fribidi with charsets"
 if test "$_fribidi" = auto ; then
     cat > $TMPC << EOF
 #include <stdlib.h>
-/* workaround for fribidi 0.10.4 and below */
-#define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8
 #include <fribidi/fribidi.h>
+FriBidiParType test;
 int main(void) {
     if (fribidi_parse_charset("UTF-8") != FRIBIDI_CHAR_SET_UTF8)
        exit(1);

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Sun Dec 11 19:47:40 2011	(r34439)
+++ trunk/sub/subreader.c	Sun Dec 11 22:32:07 2011	(r34440)
@@ -1237,11 +1237,7 @@ subtitle* subcp_recode (subtitle *sub)
  */
 int do_fribid_log2vis(int charset, const char *in, FriBidiChar *logical, FriBidiChar *visual, int flip_commas)
 {
-#if defined(FRIBIDI_PAR_LTR) || FRIBIDI_INTERFACE_VERSION >= 3
   FriBidiParType base = flip_commas ? FRIBIDI_PAR_ON : FRIBIDI_PAR_LTR;
-#else
-  FriBidiCharType base = flip_commas ? FRIBIDI_TYPE_ON : FRIBIDI_TYPE_L;
-#endif
   int len = strlen(in);
   len = fribidi_charset_to_unicode(charset, in, len, logical);
   if (!fribidi_log2vis(logical, len, &base, visual, NULL, NULL, NULL))