From 1cdc35569422ac1f58fc217e70e501482f14e18d Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Sun, 6 Mar 2016 20:37:49 +0100 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f7ac2f2..46169167 100644 --- a/README.md +++ b/README.md @@ -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; From 3c92fda370a83f64af959b36a5fee00f3958863e Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Sun, 6 Mar 2016 20:39:56 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 46169167..b0c2d1bc 100644 --- a/README.md +++ b/README.md @@ -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 ======= From 482beb6e2b5723efa12f8432de2e7e3f349ac685 Mon Sep 17 00:00:00 2001 From: Boris Spinner Date: Fri, 18 Mar 2016 15:43:44 +0100 Subject: [PATCH 3/3] Resource.Designer.cs gitignore --- .gitignore | 2 + .../Resources/Resource.Designer.cs | 166 ------------- .../Resources/Resource.Designer.cs | 228 ------------------ 3 files changed, 2 insertions(+), 394 deletions(-) delete mode 100644 Samples/MvvmCross/ExoPlayer.Droid/Resources/Resource.Designer.cs delete mode 100644 Samples/Official Demo/Resources/Resource.Designer.cs diff --git a/.gitignore b/.gitignore index 57a1574c..58c3d332 100644 --- a/.gitignore +++ b/.gitignore @@ -194,3 +194,5 @@ FakesAssemblies/ # Visual Studio 6 workspace options file *.opt + +[Rr]esource.[Dd]esigner.cs diff --git a/Samples/MvvmCross/ExoPlayer.Droid/Resources/Resource.Designer.cs b/Samples/MvvmCross/ExoPlayer.Droid/Resources/Resource.Designer.cs deleted file mode 100644 index 3da8f034..00000000 --- a/Samples/MvvmCross/ExoPlayer.Droid/Resources/Resource.Designer.cs +++ /dev/null @@ -1,166 +0,0 @@ -#pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("MvvmCross.ExoPlayer.Droid.Resource", IsApplication=false)] - -namespace MvvmCross.ExoPlayer.Droid -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public partial class Attribute - { - - // aapt resource value: 0x7f010000 - public static int MvxBind = 2130771968; - - // aapt resource value: 0x7f010004 - public static int MvxDropDownItemTemplate = 2130771972; - - // aapt resource value: 0x7f010005 - public static int MvxGroupItemTemplate = 2130771973; - - // aapt resource value: 0x7f010003 - public static int MvxItemTemplate = 2130771971; - - // aapt resource value: 0x7f010001 - public static int MvxLang = 2130771969; - - // aapt resource value: 0x7f010006 - public static int MvxSource = 2130771974; - - // aapt resource value: 0x7f010002 - public static int MvxTemplate = 2130771970; - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f030000 - public static int MvvmCrossTagId = 2130903040; - - // aapt resource value: 0x7f030001 - public static int MvxBindingTagUnique = 2130903041; - - // aapt resource value: 0x7f030007 - public static int progress = 2130903047; - - // aapt resource value: 0x7f030002 - public static int root = 2130903042; - - // aapt resource value: 0x7f030005 - public static int shutter = 2130903045; - - // aapt resource value: 0x7f030006 - public static int subtitles = 2130903046; - - // aapt resource value: 0x7f030004 - public static int surface_view = 2130903044; - - // aapt resource value: 0x7f030003 - public static int video_frame = 2130903043; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f020000 - public static int activity_videoplayer = 2130837504; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class Styleable - { - - public static int[] MvxBinding = new int[] { - 2130771968, - 2130771969}; - - // aapt resource value: 0 - public static int MvxBinding_MvxBind = 0; - - // aapt resource value: 1 - public static int MvxBinding_MvxLang = 1; - - public static int[] MvxControl = new int[] { - 2130771970}; - - // aapt resource value: 0 - public static int MvxControl_MvxTemplate = 0; - - public static int[] MvxExpandableListView = new int[] { - 2130771973}; - - // aapt resource value: 0 - public static int MvxExpandableListView_MvxGroupItemTemplate = 0; - - public static int[] MvxImageView = new int[] { - 2130771974}; - - // aapt resource value: 0 - public static int MvxImageView_MvxSource = 0; - - public static int[] MvxListView = new int[] { - 2130771971, - 2130771972}; - - // aapt resource value: 1 - public static int MvxListView_MvxDropDownItemTemplate = 1; - - // aapt resource value: 0 - public static int MvxListView_MvxItemTemplate = 0; - - static Styleable() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Styleable() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/Samples/Official Demo/Resources/Resource.Designer.cs b/Samples/Official Demo/Resources/Resource.Designer.cs deleted file mode 100644 index 10f8bf40..00000000 --- a/Samples/Official Demo/Resources/Resource.Designer.cs +++ /dev/null @@ -1,228 +0,0 @@ -#pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ - -[assembly: Android.Runtime.ResourceDesignerAttribute("Com.Google.Android.Exoplayer.Demo.Resource", IsApplication=true)] - -namespace Com.Google.Android.Exoplayer.Demo -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Dimension - { - - // aapt resource value: 0x7f040000 - public const int subtitle_minimum_font_size = 2130968576; - - static Dimension() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Dimension() - { - } - } - - public partial class Drawable - { - - // aapt resource value: 0x7f020000 - public const int ic_launcher = 2130837504; - - static Drawable() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Drawable() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f070009 - public const int audio_controls = 2131165193; - - // aapt resource value: 0x7f070007 - public const int controls_root = 2131165191; - - // aapt resource value: 0x7f070006 - public const int debug_text_view = 2131165190; - - // aapt resource value: 0x7f070005 - public const int player_state_view = 2131165189; - - // aapt resource value: 0x7f07000c - public const int retry_button = 2131165196; - - // aapt resource value: 0x7f070000 - public const int root = 2131165184; - - // aapt resource value: 0x7f07000d - public const int sample_list = 2131165197; - - // aapt resource value: 0x7f070003 - public const int shutter = 2131165187; - - // aapt resource value: 0x7f070004 - public const int subtitles = 2131165188; - - // aapt resource value: 0x7f070002 - public const int surface_view = 2131165186; - - // aapt resource value: 0x7f07000a - public const int text_controls = 2131165194; - - // aapt resource value: 0x7f07000b - public const int verbose_log_controls = 2131165195; - - // aapt resource value: 0x7f070008 - public const int video_controls = 2131165192; - - // aapt resource value: 0x7f070001 - public const int video_frame = 2131165185; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int player_activity = 2130903040; - - // aapt resource value: 0x7f030001 - public const int sample_chooser_activity = 2130903041; - - // aapt resource value: 0x7f030002 - public const int sample_chooser_inline_header = 2130903042; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f050000 - public const int application_name = 2131034112; - - // aapt resource value: 0x7f050003 - public const int audio = 2131034115; - - // aapt resource value: 0x7f05000a - public const int drm_error_not_supported = 2131034122; - - // aapt resource value: 0x7f05000c - public const int drm_error_unknown = 2131034124; - - // aapt resource value: 0x7f05000b - public const int drm_error_unsupported_scheme = 2131034123; - - // aapt resource value: 0x7f050001 - public const int enable_background_audio = 2131034113; - - // aapt resource value: 0x7f050005 - public const int logging = 2131034117; - - // aapt resource value: 0x7f050006 - public const int logging_normal = 2131034118; - - // aapt resource value: 0x7f050007 - public const int logging_verbose = 2131034119; - - // aapt resource value: 0x7f050009 - public const int off = 2131034121; - - // aapt resource value: 0x7f050008 - public const int retry = 2131034120; - - // aapt resource value: 0x7f050004 - public const int text = 2131034116; - - // aapt resource value: 0x7f050002 - public const int video = 2131034114; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - - public partial class Style - { - - // aapt resource value: 0x7f060002 - public const int DemoButton = 2131099650; - - // aapt resource value: 0x7f060001 - public const int PlayerTheme = 2131099649; - - // aapt resource value: 0x7f060000 - public const int RootTheme = 2131099648; - - static Style() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Style() - { - } - } - } -} -#pragma warning restore 1591