Commit dfad7451 by olly Committed by Oliver Woodman

Rename media samples asset

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=131693969
parent 98919fe7
......@@ -287,8 +287,7 @@
{
"name": "Super speed (PlayReady)",
"uri": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism",
"drm_scheme": "playready",
"drm_license_url": "http://playready.directtaps.net/pr/svc/rightsmanager.asmx"
"drm_scheme": "playready"
}
]
},
......
......@@ -64,7 +64,7 @@ public class SampleChooserActivity extends Activity {
uris = new String[] {dataUri};
} else {
uris = new String[] {
"asset:///sample_media.exolist.json",
"asset:///media.exolist.json",
};
}
SampleListLoader loaderTask = new SampleListLoader();
......@@ -136,7 +136,8 @@ public class SampleChooserActivity extends Activity {
reader.beginObject();
while (reader.hasNext()) {
switch (reader.nextName()) {
String name = reader.nextName();
switch (name) {
case "name":
groupName = reader.nextString();
break;
......@@ -147,6 +148,11 @@ public class SampleChooserActivity extends Activity {
}
reader.endArray();
break;
case "_comment":
reader.nextString(); // Ignore.
break;
default:
throw new ParserException("Unsupported name: " + name);
}
}
reader.endObject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment