From 391b9d392ba1e230b94b0e53991e9ced2ae6098c Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 27 Oct 2010 10:46:38 +0200
Subject: Exclude some phonon functions from binding

Generator gets confused by typedefs, causing metatypes to be
defined twice.
---
 generator/typesystem_phonon-qtscript.xml | 8 ++++++++
 generator/typesystem_phonon.xml          | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/generator/typesystem_phonon-qtscript.xml b/generator/typesystem_phonon-qtscript.xml
index 865085f..c183c02 100644
--- a/generator/typesystem_phonon-qtscript.xml
+++ b/generator/typesystem_phonon-qtscript.xml
@@ -42,6 +42,14 @@
         <modify-function signature="fromIndex(int)" remove="all" />
     </value-type>
 
+    <value-type name="Phonon::MediaSource" java-name="MediaSource">
+        <modify-function signature="deviceAccessList()const" remove="all" />
+    </value-type>
+
+    <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin">
+        <modify-function signature="deviceAccessListFor(Phonon::AudioOutputDevice)const" remove="all" />
+    </interface-type>
+
   <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::SubtitleCommand' does not have a type entry or is not an enum" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::AudioChannelCommand' does not have a type entry or is not an enum" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'AudioOutputInterface' inherits from unknown base class 'Phonon::AudioOutputInterface40'" />
diff --git a/generator/typesystem_phonon.xml b/generator/typesystem_phonon.xml
index d24d5b6..2b5b390 100644
--- a/generator/typesystem_phonon.xml
+++ b/generator/typesystem_phonon.xml
@@ -55,7 +55,9 @@
     <interface-type name="Phonon::MediaNode" java-name="MediaNode"/>
     
     <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject"/>
-    <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin"/>
+    <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin">
+        <modify-function signature="deviceAccessListFor(Phonon::AudioOutputDevice)const" remove="all"/>
+    </interface-type>
     <interface-type name="Phonon::StreamInterface" java-name="AbstractStream"/>
     <interface-type name="Phonon::VideoWidgetInterface" java-name="AbstractVideoWidget"/>
     <interface-type name="Phonon::VolumeFaderInterface" java-name="AbstractVolumeFader"/>
@@ -72,6 +74,8 @@
     </value-type>
     <value-type name="Phonon::MediaSource" java-name="MediaSource">
         <modify-function signature="operator=(Phonon::MediaSource)" remove="all"/> <!-- Covered by copy constructor -->
+    
+        <modify-function signature="deviceAccessList()const" remove="all"/>
     </value-type>
     <value-type name="Phonon::Path" java-name="Path">
         <modify-function signature="disconnect()" rename="disconnectPath"/>
-- 
cgit v1.2.3