Skip to content
This repository
Browse code

[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 authored
2  lib/liblame/include/lame.def
@@ -284,3 +284,5 @@ lame_get_id3v2_tag	@2017
284 284
 lame_set_write_id3tag_automatic	@2018
285 285
 lame_get_write_id3tag_automatic	@2019
286 286
 id3tag_set_pad	@2020
  287
+id3tag_set_textinfo_latin1  @2021
  288
+id3tag_set_textinfo_ucs2  @2023
7  xbmc/cdrip/DllLameenc.h
@@ -39,7 +39,10 @@ class DllLameEncInterface
39 39
   virtual void id3tag_set_comment(lame_global_flags* gfp, const char* comment)=0;
40 40
   virtual void id3tag_set_track(lame_global_flags* gfp, const char* track)=0;
41 41
   virtual int id3tag_set_textinfo_latin1(lame_global_flags* gfp, const char* field, const char* text)=0;
  42
+#ifndef TARGET_WINDOWS
  43
+  // id3tag_set_textinfo_utf16 isn't available in our internal liblame
42 44
   virtual int id3tag_set_textinfo_utf16(lame_global_flags* gfp, const char* field, const unsigned short* text)=0;
  45
+#endif
43 46
   virtual int id3tag_set_textinfo_ucs2(lame_global_flags* gfp, const char* field, const unsigned short* text)=0;
44 47
   virtual lame_global_flags* lame_init()=0;
45 48
   virtual int lame_init_params(lame_global_flags *gfp)=0;
@@ -66,7 +69,9 @@ class DllLameEnc : public DllDynamic, DllLameEncInterface
66 69
   DEFINE_METHOD2(void, id3tag_set_comment, (lame_global_flags* p1, const char* p2))
67 70
   DEFINE_METHOD2(void, id3tag_set_track, (lame_global_flags* p1, const char* p2))
68 71
   DEFINE_METHOD3(int, id3tag_set_textinfo_latin1, (lame_global_flags* p1, const char* p2, const char* p3))
  72
+#ifndef TARGET_WINDOWS
69 73
   DEFINE_METHOD3(int, id3tag_set_textinfo_utf16, (lame_global_flags* p1, const char* p2, const unsigned short *p3))
  74
+#endif
70 75
   DEFINE_METHOD3(int, id3tag_set_textinfo_ucs2, (lame_global_flags* p1, const char* p2, const unsigned short *p3))
71 76
   DEFINE_METHOD0(lame_global_flags*, lame_init)
72 77
   DEFINE_METHOD1(int, lame_init_params, (lame_global_flags *p1))
@@ -88,7 +93,9 @@ class DllLameEnc : public DllDynamic, DllLameEncInterface
88 93
     RESOLVE_METHOD(id3tag_set_comment)
89 94
     RESOLVE_METHOD(id3tag_set_track)
90 95
     RESOLVE_METHOD(id3tag_set_textinfo_latin1)
  96
+#ifndef TARGET_WINDOWS
91 97
     RESOLVE_METHOD(id3tag_set_textinfo_utf16)
  98
+#endif
92 99
     RESOLVE_METHOD(id3tag_set_textinfo_ucs2)
93 100
     RESOLVE_METHOD(lame_init)
94 101
     RESOLVE_METHOD(lame_init_params)

0 notes on commit f5f3472

Please sign in to comment.
Something went wrong with that request. Please try again.