summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Decina <alessandro.d@gmail.com>2011-03-01 13:25:09 +0100
committerAlessandro Decina <alessandro.d@gmail.com>2011-03-01 13:25:09 +0100
commitdf9d8ab2e14d241c05dcd883641596c278779762 (patch)
treef6c4e700ef7e4744a7f4325ff68e7b6cebb0ae9d
parent657dfec5baa20ebbeeec73a8e0859afdbbe9b68d (diff)
Don't check for STECONF_ANDROID_VERSION_FROYO
-rw-r--r--gstplayer/GstPlayer.cpp4
-rw-r--r--gstplayer/GstPlayer.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/gstplayer/GstPlayer.cpp b/gstplayer/GstPlayer.cpp
index cbafca6..f20562e 100644
--- a/gstplayer/GstPlayer.cpp
+++ b/gstplayer/GstPlayer.cpp
@@ -68,13 +68,13 @@ status_t GstPlayer::setSigBusHandlerStructTLSKey(pthread_key_t key)
UNUSED(key);
return OK;
}
-#ifdef STECONF_ANDROID_VERSION_FROYO
+
status_t GstPlayer::setDataSource(
const char *url, const KeyedVector<String8, String8> *headers) {
LOGI("setDataSource('%s')", url);
return setDataSource(url);
}
-#endif
+
status_t GstPlayer::setDataSource(const char *url)
{
LOGI("GstPlayer setDataSource(%s)", url);
diff --git a/gstplayer/GstPlayer.h b/gstplayer/GstPlayer.h
index 9e5101f..930a467 100644
--- a/gstplayer/GstPlayer.h
+++ b/gstplayer/GstPlayer.h
@@ -76,9 +76,7 @@ public:
// make available to GstDriver
void sendEvent(int msg, int ext1=0, int ext2=0) { MediaPlayerBase::sendEvent(msg, ext1, ext2); }
-#ifdef STECONF_ANDROID_VERSION_FROYO
virtual status_t setDataSource(const char *url, const KeyedVector<String8, String8> *headers);
-#endif
private:
//static void do_nothing(status_t s, void *cookie, bool cancelled) { if(s) { /* warning removal*/ } if(cookie) { /* warning removal*/ } if(cancelled) { /* warning removal*/ } }
void checkSetup();