[Player-cvs] kit/android/pub HelixPlayer.h, 1.2.2.2.4.9, 1.2.2.2.4.10
huangrenjie at helixcommunity.org huangrenjie at helixcommunity.orgUpdate of /cvsroot/player/kit/android/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2339/pub
Modified Files:
Tag: hxclient_3_6_1_atlas
HelixPlayer.h
Log Message:
revert to previous version
Index: HelixPlayer.h
===================================================================
RCS file: /cvsroot/player/kit/android/pub/Attic/HelixPlayer.h,v
retrieving revision 1.2.2.2.4.9
retrieving revision 1.2.2.2.4.10
diff -u -d -r1.2.2.2.4.9 -r1.2.2.2.4.10
--- HelixPlayer.h 4 Nov 2010 21:18:00 -0000 1.2.2.2.4.9
+++ HelixPlayer.h 8 Nov 2010 21:00:05 -0000 1.2.2.2.4.10
@@ -82,9 +82,6 @@
virtual status_t setSigBusHandlerStructTLSKey(pthread_key_t key);
virtual status_t setDataSource(const char *url);
virtual status_t setDataSource(int fd, int64_t offset, int64_t length);
-#if defined(ANDROID_ECLAIR) || defined(ANDROID_FROYO)
- virtual status_t setDataSource(const char *url, const KeyedVector<String8, String8> *headers);
-#endif
virtual status_t setVideoSurface(const sp<ISurface>& surface);
virtual status_t prepare();
virtual status_t prepareAsync();
@@ -101,12 +98,12 @@
virtual status_t setLooping(int loop);
virtual player_type playerType() {return HELIX_PLAYER;}
virtual void setAudioSink(const sp<AudioSink>& audioSink);
+#if defined(ANDROID_ECLAIR)
+ virtual status_t getMetadata(const SortedVector<media::Metadata::Type>& ids, Parcel *records){return 0;};
+#endif
+#if defined(ANDROID_ECLAIR) || defined(ANDROID_DONUT_INVOKE_SUPPORTED)
virtual status_t invoke(const Parcel& request, Parcel *reply);
-#if defined(ANDROID_ECLAIR) || defined(ANDROID_FROYO)
- virtual status_t getMetadata(const SortedVector<media::Metadata::Type>& ids, Parcel *records);
-#endif
- virtual status_t setParameters(const String8& params);
-
+#endif
//make available to AndroidClientContext
void sendEvent(int msg, int ext1 = 0, int ext2 = 0);
void setDuration(int duration) {m_Duration = duration;}