summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-08 13:40:53 -0800
committerMarco Nelissen <marcone@google.com>2015-01-08 13:48:52 -0800
commit0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7 (patch)
tree915b24bd6c686000a5c4fb8af920c8a16204e30e /media/libmediaplayerservice/MediaPlayerService.cpp
parentc52af00beda4477d0fd00c3071e6ffd9c465430b (diff)
downloadframeworks_av-0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7.zip
frameworks_av-0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7.tar.gz
frameworks_av-0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7.tar.bz2
Replace MidiFile player with a Midi extractor
This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 6ea522c..4d88a7f 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -70,7 +70,6 @@
#include "MetadataRetrieverClient.h"
#include "MediaPlayerFactory.h"
-#include "MidiFile.h"
#include "TestPlayerStub.h"
#include "StagefrightPlayer.h"
#include "nuplayer/NuPlayerDriver.h"