summaryrefslogtreecommitdiff
path: root/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
blob: 9785b4198d512bc6e49a62f45a2f1f22a3fb42cb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
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