Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into bspinner/update_mvx_4
Browse files Browse the repository at this point in the history
# Conflicts:
#	Samples/MvvmCross/ExoPlayer.Droid/Resources/Resource.Designer.cs
#	Samples/Official Demo/Resources/Resource.Designer.cs
  • Loading branch information
Boris Spinner committed Mar 24, 2016
2 parents e00bc7b + 482beb6 commit 0000835
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 395 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,5 @@ FakesAssemblies/

# Visual Studio 6 workspace options file
*.opt

[Rr]esource.[Dd]esigner.cs
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Documentation
Android.Net.Uri soundString = Android.Net.Uri.Parse("http://www.montemagno.com/sample.mp3");

FrameworkSampleSource sampleSource = new FrameworkSampleSource(this, soundString, null);
TrackRenderer aRenderer = new MediaCodecAudioTrackRenderer(sampleSource, null, true);
TrackRenderer aRenderer = MediaCodecAudioTrackRenderer(sampleSource, MediaCodecSelector.Default);

mediaPlayer.Prepare(aRenderer);
mediaPlayer.PlayWhenReady = true;
Expand All @@ -31,6 +31,7 @@ Thanks to

- [Nathan Barger][NathanBarger] for doing the initial porting work
- [MKuckert](https://github.com/MKuckert) for helping with bindings and samples
- [bspinner](https://github.com/bspinner) for helping with bindings and samples

License
=======
Expand Down
166 changes: 0 additions & 166 deletions Samples/MvvmCross/ExoPlayer.Droid/Resources/Resource.Designer.cs

This file was deleted.

Loading

0 comments on commit 0000835

Please sign in to comment.