You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.p...

39 lines
1.2 KiB

https://github.com/xmms2/xmms2-devel/pull/2
From: Jérôme Carretero <cJ@zougloub.eu>
Date: Tue, 24 Oct 2017 18:43:26 -0400
Subject: [PATCH] plugins: mac: support newer mac API version
--- a/src/plugins/mac/mac.cpp
+++ b/src/plugins/mac/mac.cpp
@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
gchar *name;
field_name = pTagField->GetFieldName ();
- name = (gchar *)GetUTF8FromUTF16 (field_name);
+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
+ name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
+#else
+ name = (gchar *)GetUTF8FromUTF16 (field_name);
+#endif
memset (field_value, 0, 255);
int size = 255;
p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
--- a/src/plugins/mac/source_adapter.h
+++ b/src/plugins/mac/source_adapter.h
@@ -38,7 +38,13 @@ public:
~CSourceAdapter () {};
// open / close
- int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
+ int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
+#else
+ int Open (const wchar_t * pName)
+#endif
+ { return ERROR_SUCCESS; }
+
int Close () { return ERROR_SUCCESS; }
// read / write