opie-mediaplayer1: fix compile error (fixes bug #4624)

diff --git a/packages/opie-mediaplayer1/files/.mtn2git_empty b/packages/opie-mediaplayer1/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/opie-mediaplayer1/files/double_name.patch b/packages/opie-mediaplayer1/files/double_name.patch
new file mode 100644 (file)
index 0000000..d4e787f
--- /dev/null
+++ b/packages/opie-mediaplayer1/files/double_name.patch
@@ -0,0 +1,11 @@
+--- opieplayer/mediaplayerplugininterface.h    3 Mar 2002 17:13:17 -0000       1.5
++++ opieplayer/mediaplayerplugininterface.h    4 Oct 2008 16:45:38 -0000       1.6
+@@ -65,7 +65,7 @@
+     virtual int audioSamples( int stream ) = 0;
+     virtual bool audioSetSample( long sample, int stream ) = 0;
+     virtual long audioGetSample( int stream ) = 0;
+-    virtual bool audioReadSamples( short *samples, int channels, long samples, long& samplesRead, int stream ) = 0;
++    virtual bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ) = 0;
+ 
+     // If decoder doesn't support video then return 0 here
+     virtual int videoStreams() = 0;

diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
index ca0beac..db194b9 100644 (file)
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
@@ -2,5 +2,5 @@ require ${PN}.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           file://double_name.patch;patch=1"