[Player-cvs] kit/android PlayerDriver.cpp, 1.10.2.13.2.26, 1.10.2.13.2.27
huangrenjie at helixcommunity.org huangrenjie at helixcommunity.orgUpdate of /cvsroot/player/kit/android
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2339
Modified Files:
Tag: hxclient_3_6_1_atlas
PlayerDriver.cpp
Log Message:
revert to previous version
Index: PlayerDriver.cpp
===================================================================
RCS file: /cvsroot/player/kit/android/Attic/PlayerDriver.cpp,v
retrieving revision 1.10.2.13.2.26
retrieving revision 1.10.2.13.2.27
diff -u -d -r1.10.2.13.2.26 -r1.10.2.13.2.27
--- PlayerDriver.cpp 4 Nov 2010 21:17:59 -0000 1.10.2.13.2.26
+++ PlayerDriver.cpp 8 Nov 2010 21:00:04 -0000 1.10.2.13.2.27
@@ -1314,37 +1314,7 @@
}
}
-#if defined(ANDROID_ECLAIR) || defined(ANDROID_FROYO)
-//XXXX to be implemented:
-status_t HelixPlayer::setDataSource(const char *url, const KeyedVector<String8, String8> *headers)
-{
- status_t ret = INVALID_OPERATION;
-
-#if defined(ANDROID_2_2)
- if (!headers)
- {
- ret = setDataSource(url);
- }
- else
- {
- // todo: deal with header.
- }
-#endif // ANDROID_2_2
-
- return ret;
-}
-
-status_t HelixPlayer::getMetadata(const SortedVector<media::Metadata::Type>& ids, Parcel *records)
-{
- return 0;
-}
-#endif
-
-status_t HelixPlayer::setParameters(const String8& params)
-{
- return 0;
-}
-
+#if defined(ANDROID_ECLAIR) || defined(ANDROID_DONUT_INVOKE_SUPPORTED)
status_t HelixPlayer::invoke(const Parcel& request, Parcel *reply)
{
status_t retVal = HXR_FAIL;
@@ -1378,5 +1348,6 @@
}
return retVal;
}
+#endif
}; // namespace android