summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-08-19 17:54:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 02:43:23 +0000
commitaf11287b39b6420c8a05a5c8c9b72f7e4ddc82f7 (patch)
tree5f9322f9922bec66be0161c0ee7421e601003392 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
parent97c7fa1b1596a062147f034a2b44781193c052cf (diff)
parent4b75b86785d674b98dade17cd197b912d87cd279 (diff)
downloadframeworks_av-af11287b39b6420c8a05a5c8c9b72f7e4ddc82f7.zip
frameworks_av-af11287b39b6420c8a05a5c8c9b72f7e4ddc82f7.tar.gz
frameworks_av-af11287b39b6420c8a05a5c8c9b72f7e4ddc82f7.tar.bz2
Merge "NuPlayer: add support for proper stop" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
index a9ff8b6..f520395 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
@@ -86,6 +86,9 @@ private:
STATE_RUNNING,
STATE_PAUSED,
STATE_RESET_IN_PROGRESS,
+ STATE_STOPPED, // equivalent to PAUSED
+ STATE_STOPPED_AND_PREPARING, // equivalent to PAUSED, but seeking
+ STATE_STOPPED_AND_PREPARED, // equivalent to PAUSED, but seek complete
};
mutable Mutex mLock;