made compilable with Froyo

diff --git a/Android.mk b/Android.mk
index 01d8dfe..1128135 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -726,7 +726,7 @@ LOCAL_MODULE = libandroidmplayer
 LOCAL_CFLAGS = 
 LOCAL_SRC_FILES = MPlayer.cpp MPlayerRenderer.cpp
 LOCAL_SHARED_LIBRARIES := libz libasound libc libdl libutils libcutils \
-       libbinder libmedia libui libandroid_runtime liblog
+       libbinder libmedia libui libandroid_runtime liblog libsurfaceflinger_client
 LOCAL_STATIC_LIBRARIES := libmplayer $(FFMPEGPARTS) libft2
 include $(BUILD_SHARED_LIBRARY)
 

diff --git a/MPlayer.cpp b/MPlayer.cpp
index 35bfe53..2c0b0af 100644 (file)
--- a/MPlayer.cpp
+++ b/MPlayer.cpp
@@ -79,9 +79,10 @@ namespace android {
                release();
        }
 
-       status_t MPlayer::setDataSource(const char* path)
+       status_t MPlayer::setDataSource(
+                       const char *uri, const KeyedVector<String8, String8> * headers)
        {
-               return setdatasource(path, -1, 0, 0x78ffffLL);
+               return setdatasource(uri, -1, 0, 0x78ffffLL);
        }
 
        status_t MPlayer::setDataSource(int fd, int64_t offset, int64_t length)
@@ -230,7 +231,6 @@ namespace android {
                        return NO_ERROR;
                }
 
-
                sendEvent (MEDIA_PREPARED);     /* todo : should be moved to main loop */
                return NO_ERROR;
        }

diff --git a/MPlayer.h b/MPlayer.h
index 60b02e0..03ae098 100644 (file)
--- a/MPlayer.h
+++ b/MPlayer.h
@@ -12,6 +12,7 @@
 
 #include <media/MediaPlayerInterface.h>
 #include <media/AudioTrack.h>
+#include <surfaceflinger/ISurface.h>
 
 #include "mplayer_lib.h"
 
@@ -28,7 +29,8 @@ namespace android {
 
                        virtual void        onFirstRef();
                        virtual status_t    initCheck();
-                       virtual status_t    setDataSource(const char* path);
+                       virtual status_t    setDataSource(
+                                       const char *uri, const KeyedVector<String8, String8>*headers);
                        virtual status_t    setDataSource(int fd, int64_t offset, int64_t length);
                        virtual status_t    setVideoSurface(const sp<ISurface>& surface);
                        virtual status_t    prepare();

diff --git a/MPlayerRenderer.cpp b/MPlayerRenderer.cpp
index 35e3a64..1d61695 100644 (file)
--- a/MPlayerRenderer.cpp
+++ b/MPlayerRenderer.cpp
@@ -9,7 +9,7 @@
 #include <utils/Log.h>
 
 #include <binder/MemoryHeapBase.h>
-#include <ui/ISurface.h>
+#include <surfaceflinger/ISurface.h>
 #include "MPDebug.h"
 #include "MPlayerRenderer.h"