Android: Updated BASS.NET version.

Resynced project files after changes in iOS. Related to issue #406.
ycastonguay · Apr 12, 2013 · 75ee759 · 75ee759
1 parent 4bd50f2
commit 75ee759
Show file tree

Hide file tree

Showing 15 changed files with 2,536 additions and 2,489 deletions.
diff --git a/MPfm/MPfm.Android/Classes/Activities/MainActivity.cs b/MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
@@ -53,7 +53,7 @@ protected override void OnCreate(Bundle bundle)
             // Request features
             RequestWindowFeature(WindowFeatures.ActionBar);
             SetContentView(Resource.Layout.Main);
-            //ActionBar.NavigationMode = ActionBarNavigationMode.Tabs;
+            ActionBar.NavigationMode = ActionBarNavigationMode.Tabs;
             // TODO: Try to find a way to display only one tab at a time (similar to Google Play Music)
 
             // Get controls

diff --git a/MPfm/MPfm.Android/Classes/Application.cs b/MPfm/MPfm.Android/Classes/Application.cs
@@ -21,19 +21,9 @@
 using Android.Runtime;
 using MPfm.Android.Classes.Fragments;
 using MPfm.Android.Classes.Navigation;
-using MPfm.Library.Database;
-using MPfm.Library.Database.Interfaces;
-using MPfm.MVP;
 using MPfm.MVP.Bootstrap;
-using MPfm.MVP.Helpers;
 using MPfm.MVP.Navigation;
-using MPfm.MVP.Presenters;
-using MPfm.MVP.Presenters.Interfaces;
-using MPfm.MVP.Services;
-using MPfm.MVP.Services.Interfaces;
 using MPfm.MVP.Views;
-using MPfm.Player;
-using MPfm.Sound.Bass.Net;
 
 namespace MPfm.Android.Classes
 {
@@ -54,6 +44,11 @@ public override void OnCreate()
             container.Register<MobileNavigationManager, AndroidNavigationManager>().AsSingleton();
             container.Register<ISplashView, SplashFragment>().AsMultiInstance();
             container.Register<IPlayerView, PlayerFragment>().AsMultiInstance();
+            container.Register<IPlayerMetadataView, PlayerMetadataFragment>().AsMultiInstance();
+            container.Register<IMarkersView, MarkersFragment>().AsMultiInstance();
+            container.Register<ILoopsView, LoopsFragment>().AsMultiInstance();
+            container.Register<ITimeShiftingView, TimeShiftingFragment>().AsMultiInstance();
+            container.Register<IPitchShiftingView, PitchShiftingFragment>().AsMultiInstance();
             container.Register<IUpdateLibraryView, UpdateLibraryFragment>().AsMultiInstance();
             container.Register<IMobileLibraryBrowserView, MobileLibraryBrowserFragment>().AsMultiInstance();
             container.Register<IAudioPreferencesView, AudioPreferencesFragment>().AsMultiInstance();

diff --git a/MPfm/MPfm.Android/Classes/Fragments/LoopsFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/LoopsFragment.cs
@@ -55,6 +55,10 @@ public void OnClick(View v)
         public Action OnAddLoop { get; set; }
         public Action<Loop> OnEditLoop { get; set; }
 
+        public void LoopError(Exception ex)
+        {            
+        }
+
         public void RefreshLoops(List<Loop> loops)
         {
         }

diff --git a/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs
@@ -22,6 +22,7 @@
 using Android.Views;
 using Android.Widget;
 using MPfm.Android.Classes.Fragments.Base;
+using MPfm.MVP.Presenters;
 using MPfm.MVP.Views;
 using MPfm.Player.Objects;
 
@@ -52,9 +53,14 @@ public void OnClick(View v)
 
         #region IMarkersView implementation
 
-        public Action OnAddMarker { get; set; }
+        public Action<MarkerTemplateNameType> OnAddMarker { get; set; }
         public Action<Marker> OnEditMarker { get; set; }
-
+        public Action<Marker> OnSelectMarker { get; set; }
+
+        public void MarkerError(Exception ex)
+        {            
+        }
+
         public void RefreshMarkers(List<Marker> markers)
         {
         }

diff --git a/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs
@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Android.App;
+using Android.Graphics;
 using Android.Views;
 using Android.Widget;
 using MPfm.Android.Classes.Adapters;
@@ -70,25 +71,25 @@ public void OnClick(View v)
             builder.Show();
         }
 
-
         #region IMobileLibraryBrowserView implementation
 
         public MobileLibraryBrowserType BrowserType { get; set; }
         public string Filter { get; set; }
         public Action<int> OnItemClick { get; set; }
         public Action<string, string> OnRequestAlbumArt { get; set; }
 
-        public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, MobileLibraryBrowserType browserType, string navigationBarTitle)
+        public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, MobileLibraryBrowserType browserType, string navigationBarTitle, string navigationBarSubtitle)
         {
             _entities = entities;
-            var listAdapter = (MobileLibraryBrowserListAdapter) ListAdapter;
+            var listAdapter = (MobileLibraryBrowserListAdapter)ListAdapter;
 
             // Update list adapter only if the view was created
             if (listAdapter != null)
             {
-                http://stackoverflow.com/questions/6837397/updating-listview-by-notifydatasetchanged-has-to-use-runonuithread
-                Activity.RunOnUiThread(() => {
-                    listAdapter.SetData(entities);   
+                // http://stackoverflow.com/questions/6837397/updating-listview-by-notifydatasetchanged-has-to-use-runonuithread
+                Activity.RunOnUiThread(() =>
+                {
+                    listAdapter.SetData(entities);
                     listAdapter.NotifyDataSetChanged();
                 });
             }

diff --git a/MPfm/MPfm.Android/Classes/Fragments/PlayerFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/PlayerFragment.cs
@@ -17,22 +17,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading.Tasks;
-using System.Timers;
-using Android.App;
 using Android.OS;
 using Android.Views;
 using Android.Widget;
 using Java.Lang;
 using MPfm.Android.Classes.Fragments.Base;
 using MPfm.Android.Classes.Helpers;
-using MPfm.Core;
 using MPfm.MVP.Messages;
+using MPfm.MVP.Models;
 using MPfm.MVP.Views;
-using MPfm.Player;
 using MPfm.Sound.AudioFiles;
-using Environment = Android.OS.Environment;
 
 namespace MPfm.Android.Classes.Fragments
 {
@@ -113,6 +108,7 @@ public void OnClick(View v)
         public Action<float> OnPlayerSetPitchShifting { get; set; }
         public Action<float> OnPlayerSetTimeShifting { get; set; }
         public Action<float> OnPlayerSetPosition { get; set; }
+        public Func<float, PlayerPositionEntity> OnPlayerRequestPosition { get; set; }
 
         public void RefreshPlayerStatus(PlayerStatusType status)
         {
@@ -126,7 +122,7 @@ public void RefreshPlayerPosition(MVP.Models.PlayerPositionEntity entity)
                 });
         }
 
-        public void RefreshSongInformation(AudioFile audioFile)
+        public void RefreshSongInformation(AudioFile audioFile, long lengthBytes, int playlistIndex, int playlistCount)
         {
             Activity.RunOnUiThread(() =>
                 {

diff --git a/MPfm/MPfm.Android/Classes/Navigation/AndroidNavigationManager.cs b/MPfm/MPfm.Android/Classes/Navigation/AndroidNavigationManager.cs
@@ -46,11 +46,16 @@ public override void PushTabView(MobileNavigationTabType type, IBaseView view)
             MainActivity.PushTabView(type, (Fragment)view);
         }
 
-        public override void PushDialogView(IBaseView view)
+        public override void PushDialogView(string viewTitle, IBaseView view)
         {
             MainActivity.PushDialogView((Fragment)view);
         }
 
+        public override void PushDialogSubview(string parentViewTitle, IBaseView view)
+        {
+
+        }
+
         public override void PushPlayerSubview(IPlayerView playerView, IBaseView view)
         {
         }

diff --git a/MPfm/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj b/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
@@ -180,9 +180,6 @@
     <Compile Include="Config\MPfmWindowsConfig.cs" />
     <Compile Include="Services\PlayerService.cs" />
     <Compile Include="Services\Interfaces\IPlayerService.cs" />
-    <Compile Include="Presenters\Interfaces\IEffectsPresenter.cs" />
-    <Compile Include="Views\IEffectsView.cs" />
-    <Compile Include="Presenters\EffectsPresenter.cs" />
     <Compile Include="Views\IPreferencesView.cs" />
     <Compile Include="Presenters\Interfaces\IGeneralPreferencesPresenter.cs" />
     <Compile Include="Presenters\GeneralPreferencesPresenter.cs" />
@@ -231,5 +228,16 @@
     <Compile Include="Presenters\Interfaces\IMarkerDetailsPresenter.cs" />
     <Compile Include="Presenters\LoopDetailsPresenter.cs" />
     <Compile Include="Presenters\MarkerDetailsPresenter.cs" />
+    <Compile Include="Messages\MarkerUpdatedMessage.cs" />
+    <Compile Include="Views\IPlayerStatusView.cs" />
+    <Compile Include="Presenters\Interfaces\IPlayerStatusPresenter.cs" />
+    <Compile Include="Presenters\PlayerStatusPresenter.cs" />
+    <Compile Include="Messages\MobileNavigationManagerCommandMessage.cs" />
+    <Compile Include="Views\IEqualizerPresetsView.cs" />
+    <Compile Include="Presenters\Interfaces\IEqualizerPresetsPresenter.cs" />
+    <Compile Include="Views\IEqualizerPresetDetailsView.cs" />
+    <Compile Include="Presenters\Interfaces\IEqualizerPresetDetailsPresenter.cs" />
+    <Compile Include="Presenters\EqualizerPresetsPresenter.cs" />
+    <Compile Include="Presenters\EqualizerPresetDetailsPresenter.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.csproj b/MPfm/MPfm.MVP/MPfm.MVP.csproj
@@ -168,9 +168,6 @@
     <Compile Include="Config\MPfmWindowsConfig.cs" />
     <Compile Include="Services\PlayerService.cs" />
     <Compile Include="Services\Interfaces\IPlayerService.cs" />
-    <Compile Include="Presenters\Interfaces\IEffectsPresenter.cs" />
-    <Compile Include="Views\IEffectsView.cs" />
-    <Compile Include="Presenters\EffectsPresenter.cs" />
     <Compile Include="Views\IPreferencesView.cs" />
     <Compile Include="Presenters\Interfaces\IGeneralPreferencesPresenter.cs" />
     <Compile Include="Presenters\GeneralPreferencesPresenter.cs" />
@@ -219,5 +216,16 @@
     <Compile Include="Presenters\Interfaces\IMarkerDetailsPresenter.cs" />
     <Compile Include="Presenters\LoopDetailsPresenter.cs" />
     <Compile Include="Presenters\MarkerDetailsPresenter.cs" />
+    <Compile Include="Messages\MarkerUpdatedMessage.cs" />
+    <Compile Include="Views\IPlayerStatusView.cs" />
+    <Compile Include="Presenters\Interfaces\IPlayerStatusPresenter.cs" />
+    <Compile Include="Presenters\PlayerStatusPresenter.cs" />
+    <Compile Include="Messages\MobileNavigationManagerCommandMessage.cs" />
+    <Compile Include="Views\IEqualizerPresetsView.cs" />
+    <Compile Include="Presenters\Interfaces\IEqualizerPresetsPresenter.cs" />
+    <Compile Include="Views\IEqualizerPresetDetailsView.cs" />
+    <Compile Include="Presenters\Interfaces\IEqualizerPresetDetailsPresenter.cs" />
+    <Compile Include="Presenters\EqualizerPresetsPresenter.cs" />
+    <Compile Include="Presenters\EqualizerPresetDetailsPresenter.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.Player/MPfm.Player.Android.csproj b/MPfm/MPfm.Player/MPfm.Player.Android.csproj
@@ -79,6 +79,9 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Bass.Net.android">
+      <HintPath>..\MPfm.Sound\Lib\Android\Bass.Net.android.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />