commit 46d1c53d608344d8f31e12b2f72f24b2908b650c
author Glenn Kasten <gkasten@google.com> Mon Jan 09 10:25:12 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 09 10:25:12 2012 -0800
tree 90e53f9597203cc24695c5421b99bd68ca819411
parent b47c7beddecd38ae565d84b72da526843bfdd43e
parent c4374bd42cd7eadda841a6b089234becb4f6c508

Merge "Remove virtual from methods that don't need it"

src/android/android_GenericPlayer.h

diff --git a/src/android/android_GenericPlayer.h b/src/android/android_GenericPlayer.h
index d3206a1..bc52846 100644
--- a/src/android/android_GenericPlayer.h
+++ b/src/android/android_GenericPlayer.h
@@ -60,22 +60,22 @@
     GenericPlayer(const AudioPlayback_Parameters* params);
     virtual ~GenericPlayer();
 
-    virtual void init(const notif_cbf_t cbf, void* notifUser);
+    void init(const notif_cbf_t cbf, void* notifUser);
     virtual void preDestroy();
 
     void setDataSource(const char *uri);
     void setDataSource(int fd, int64_t offset, int64_t length, bool closeAfterUse = false);
 
-            void prepare();
+    void prepare();
     virtual void play();
-    virtual void pause();
-    virtual void stop();
+    void pause();
+    void stop();
     // timeMsec must be >= 0 or == ANDROID_UNKNOWN_TIME (used by StreamPlayer after discontinuity)
-    virtual void seek(int64_t timeMsec);
-    virtual void loop(bool loop);
-    virtual void setBufferingUpdateThreshold(int16_t thresholdPercent);
+    void seek(int64_t timeMsec);
+    void loop(bool loop);
+    void setBufferingUpdateThreshold(int16_t thresholdPercent);
 
-    virtual void getDurationMsec(int* msec); //msec != NULL, ANDROID_UNKNOWN_TIME if unknown
+    void getDurationMsec(int* msec); //msec != NULL, ANDROID_UNKNOWN_TIME if unknown
     virtual void getPositionMsec(int* msec) = 0; //msec != NULL, ANDROID_UNKNOWN_TIME if unknown
 
     virtual void setVideoSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture) {}