diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
| -rw-r--r-- | include/media/IMediaPlayer.h | 1 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 4488ce4..26a25b0 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -473,7 +473,7 @@ protected: friend class AudioTrack; virtual bool threadLoop(); AudioTrack& mReceiver; - virtual ~AudioTrackThread(); + ~AudioTrackThread(); Mutex mMyLock; // Thread::mLock is private Condition mMyCond; // Thread::mThreadExitedCondition is private bool mPaused; // whether thread is currently paused diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h index 00facc5..4ed1863 100644 --- a/include/media/IMediaPlayer.h +++ b/include/media/IMediaPlayer.h @@ -64,6 +64,7 @@ public: virtual status_t setParameter(int key, const Parcel& request) = 0; virtual status_t getParameter(int key, Parcel* reply) = 0; virtual status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) = 0; + virtual status_t getRetransmitEndpoint(struct sockaddr_in* endpoint) = 0; virtual status_t setNextPlayer(const sp<IMediaPlayer>& next) = 0; // Invoke a generic method on the player by using opaque parcels diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index a70fe8c..518948c 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -50,9 +50,6 @@ enum player_type { // The shared library with the test player is passed passed as an // argument to the 'test:' url in the setDataSource call. TEST_PLAYER = 5, - - AAH_RX_PLAYER = 100, - AAH_TX_PLAYER = 101, }; @@ -154,12 +151,15 @@ public: virtual status_t getParameter(int key, Parcel *reply) = 0; // Right now, only the AAX TX player supports this functionality. For now, - // provide a default implementation which indicates a lack of support for - // this functionality to make life easier for all of the other media player + // provide default implementations which indicate a lack of support for this + // functionality to make life easier for all of the other media player // maintainers out there. virtual status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) { return INVALID_OPERATION; } + virtual status_t getRetransmitEndpoint(struct sockaddr_in* endpoint) { + return INVALID_OPERATION; + } // Invoke a generic method on the player by using opaque parcels // for the request and reply. |