Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[WIN32] fixed: lame_enc.dll couldn't be loaded due to missing symbols…

…. added some exports and removed id3tag_set_textinfo_utf16 because its not available in our internal liblame. I ifdefed it for windows but since it seems not to be used in XBMC it could be removed entirely.
  • Loading branch information...
commit f5f34723fd55841a9855a803dc6496cb44db7a60 1 parent c6c47ad
@wsoltys wsoltys authored
Showing with 9 additions and 0 deletions.
  1. +2 −0  lib/liblame/include/lame.def
  2. +7 −0 xbmc/cdrip/DllLameenc.h
View
2  lib/liblame/include/lame.def
@@ -284,3 +284,5 @@ lame_get_id3v2_tag @2017
lame_set_write_id3tag_automatic @2018
lame_get_write_id3tag_automatic @2019
id3tag_set_pad @2020
+id3tag_set_textinfo_latin1 @2021
+id3tag_set_textinfo_ucs2 @2023
View
7 xbmc/cdrip/DllLameenc.h
@@ -39,7 +39,10 @@ class DllLameEncInterface
virtual void id3tag_set_comment(lame_global_flags* gfp, const char* comment)=0;
virtual void id3tag_set_track(lame_global_flags* gfp, const char* track)=0;
virtual int id3tag_set_textinfo_latin1(lame_global_flags* gfp, const char* field, const char* text)=0;
+#ifndef TARGET_WINDOWS
+ // id3tag_set_textinfo_utf16 isn't available in our internal liblame
virtual int id3tag_set_textinfo_utf16(lame_global_flags* gfp, const char* field, const unsigned short* text)=0;
+#endif
virtual int id3tag_set_textinfo_ucs2(lame_global_flags* gfp, const char* field, const unsigned short* text)=0;
virtual lame_global_flags* lame_init()=0;
virtual int lame_init_params(lame_global_flags *gfp)=0;
@@ -66,7 +69,9 @@ class DllLameEnc : public DllDynamic, DllLameEncInterface
DEFINE_METHOD2(void, id3tag_set_comment, (lame_global_flags* p1, const char* p2))
DEFINE_METHOD2(void, id3tag_set_track, (lame_global_flags* p1, const char* p2))
DEFINE_METHOD3(int, id3tag_set_textinfo_latin1, (lame_global_flags* p1, const char* p2, const char* p3))
+#ifndef TARGET_WINDOWS
DEFINE_METHOD3(int, id3tag_set_textinfo_utf16, (lame_global_flags* p1, const char* p2, const unsigned short *p3))
+#endif
DEFINE_METHOD3(int, id3tag_set_textinfo_ucs2, (lame_global_flags* p1, const char* p2, const unsigned short *p3))
DEFINE_METHOD0(lame_global_flags*, lame_init)
DEFINE_METHOD1(int, lame_init_params, (lame_global_flags *p1))
@@ -88,7 +93,9 @@ class DllLameEnc : public DllDynamic, DllLameEncInterface
RESOLVE_METHOD(id3tag_set_comment)
RESOLVE_METHOD(id3tag_set_track)
RESOLVE_METHOD(id3tag_set_textinfo_latin1)
+#ifndef TARGET_WINDOWS
RESOLVE_METHOD(id3tag_set_textinfo_utf16)
+#endif
RESOLVE_METHOD(id3tag_set_textinfo_ucs2)
RESOLVE_METHOD(lame_init)
RESOLVE_METHOD(lame_init_params)
Please sign in to comment.
Something went wrong with that request. Please try again.