Permalink
Browse files

[fix] - revert c0855cb because its not needed anymore

  • Loading branch information...
1 parent 28327d0 commit 672a6dc9958c6416081b0071aab97e335a532ddd @Memphiz Memphiz committed Feb 20, 2012
Showing with 1 addition and 26 deletions.
  1. +1 −1 configure.in
  2. +0 −25 lib/libid3tag/libid3tag/metadata.c
View
@@ -2145,7 +2145,7 @@ XB_CONFIG_MODULE([lib/libid3tag/libid3tag],[
./configure \
CC="$CC" \
CXX="$CXX" \
- CFLAGS="$CFLAGS $ARCH_DEFINES" \
+ CFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--host=$host_alias \
@@ -299,29 +299,6 @@ const id3_ucs4_t* id3_metadata_getcomment(const struct id3_tag* tag, enum id3_fi
union id3_field const *field;
struct id3_frame const *frame;
int commentNumber = 0;
-//on ios use the "old" version without the bugfix from https://github.com/xbmc/xbmc/commit/e09cb07
-//because it somehow exposes a bug which leads to unreproducable crashs on id3v2 tags
-#ifdef TARGET_DARWIN_IOS
- const id3_ucs4_t* ucs4 = 0;
- // return the first non-empty comment
- do
- {
- frame = id3_tag_findframe(tag, ID3_FRAME_COMMENT, commentNumber++);
- if (frame == 0)
- return id3_ucs4_empty;
-
- *encoding = id3_field_gettextencoding(id3_frame_field(frame, 0));
-
- field = id3_frame_field(frame, 3);
- if (field == 0)
- return id3_ucs4_empty;
-
- ucs4 = id3_field_getfullstring(field);
- if (!ucs4)
- return id3_ucs4_empty;
- }
- while (*ucs4 == 0);
-#else
const id3_ucs4_t* ucs4 = 0;
// return the first non-empty comment
@@ -362,9 +339,7 @@ const id3_ucs4_t* id3_metadata_getcomment(const struct id3_tag* tag, enum id3_fi
}
}
while (frame);
-#endif//else TARGET_DARWIN_IOS
return ucs4;
-// return id3_ucs4_empty;
}
int id3_metadata_setcomment(struct id3_tag* tag, id3_ucs4_t* value)

0 comments on commit 672a6dc

Please sign in to comment.