summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-07-13 07:20:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-13 07:20:47 -0700
commit5f0033d27b75fead593ed7ca2b86f5b6f5adf6cc (patch)
treee12cae6d070d56571a5ce2160199b4a54edd0f7a /include
parent1879fff068422852c1483dcf8365c2ff0e2fadfc (diff)
parentd4070955e28ae62aa4be1657f9d32acde104bb86 (diff)
downloadframeworks_av-5f0033d27b75fead593ed7ca2b86f5b6f5adf6cc.zip
frameworks_av-5f0033d27b75fead593ed7ca2b86f5b6f5adf6cc.tar.gz
frameworks_av-5f0033d27b75fead593ed7ca2b86f5b6f5adf6cc.tar.bz2
Merge "Remove dead code in libmedia"
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioRecord.h7
-rw-r--r--include/media/AudioTrack.h2
-rw-r--r--include/media/Visualizer.h2
3 files changed, 0 insertions, 11 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h
index 813ea85..01ab8c7 100644
--- a/include/media/AudioRecord.h
+++ b/include/media/AudioRecord.h
@@ -72,12 +72,6 @@ public:
};
};
- /* These are static methods to control the system-wide AudioFlinger
- * only privileged processes can have access to them
- */
-
-// static status_t setMasterMute(bool mute);
-
/* As a convenience, if a callback is supplied, a handler thread
* is automatically created with the appropriate priority. This thread
* invokes the callback when a new buffer becomes ready or an overrun condition occurs.
@@ -330,7 +324,6 @@ private:
friend class AudioRecord;
virtual bool threadLoop();
virtual status_t readyToRun();
- virtual void onFirstRef() {}
AudioRecord& mReceiver;
};
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 639d6d2..325f780 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -472,8 +472,6 @@ protected:
private:
friend class AudioTrack;
virtual bool threadLoop();
- virtual status_t readyToRun();
- virtual void onFirstRef();
AudioTrack& mReceiver;
~AudioTrackThread();
Mutex mMyLock; // Thread::mLock is private
diff --git a/include/media/Visualizer.h b/include/media/Visualizer.h
index fdec5ee..aa58905 100644
--- a/include/media/Visualizer.h
+++ b/include/media/Visualizer.h
@@ -142,8 +142,6 @@ private:
private:
friend class Visualizer;
virtual bool threadLoop();
- virtual status_t readyToRun();
- virtual void onFirstRef();
Visualizer& mReceiver;
Mutex mLock;
uint32_t mSleepTimeUs;