iOS: Bug fixes in SelectPlaylistViewController and preferences-relate…

…d ViewControllers. Fixed player bug on iOS where the reported position of the next song was wrong in most cases.
ycastonguay · Nov 17, 2013 · fee4c97 · fee4c97
1 parent 2e4dd1f
commit fee4c97
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/MPfm/MPfm.Player/Player.cs b/MPfm/MPfm.Player/Player.cs
@@ -1869,8 +1869,8 @@ internal int StreamCallback(int handle, IntPtr buffer, int length, IntPtr user)
 
                 Tracing.Log("StreamCallback -- Getting main channel position...");
                 long position = _mixerChannel.GetPosition(_fxChannel.Handle);
-                if (_useFloatingPoint)
-                    position /= 2;
+//                if (_useFloatingPoint)
+//                    position /= 2;
 
                 // Get remanining data in buffer
                 Tracing.Log("StreamCallback -- Getting BASS_DATA_AVAILABLE...");
@@ -1984,8 +1984,8 @@ internal void PlayerSyncProc(int handle, int channel, int data, IntPtr user)
 
             _mixerChannel.Lock(true);
             long position = _mixerChannel.GetPosition();
-            if (_useFloatingPoint)
-                position /= 2;
+//            if (_useFloatingPoint)
+//                position /= 2;
 
             // Get remanining data in buffer
             //int buffered = mainChannel.GetData(IntPtr.Zero, (int)BASSData.BASS_DATA_AVAILABLE);

diff --git a/MPfm/MPfm.Sound/Playlists/PlaylistItem.cs b/MPfm/MPfm.Sound/Playlists/PlaylistItem.cs
@@ -258,10 +258,7 @@ public void Load(bool useFloatingPoint)
 
             // Check if a channel already exists
             if(channel != null)
-            {
-                // Dispose channel
                 Dispose();
-            }
 
             // Load channel
             channel = Channel.CreateFileStreamForDecoding(audioFile.FilePath, useFloatingPoint);
@@ -271,16 +268,11 @@ public void Load(bool useFloatingPoint)
 
             // Check if the channel is using floating point
             if (channel.IsFloatingPoint)
-            {
-                // Divide value by 2
                 lengthBytes /= 2;
-            }
 
             // Check if this is a FLAC file over 44100Hz
             if (audioFile.FileType == AudioFileFormat.FLAC && audioFile.SampleRate > 44100)
-            {
                 lengthBytes = (long)((float)lengthBytes * 1.5f);
-            }
 
             lengthSamples = ConvertAudio.ToPCM(lengthBytes, (uint)audioFile.BitsPerSample, 2);
             lengthMilliseconds = (int)ConvertAudio.ToMS(lengthSamples, (uint)audioFile.SampleRate);

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/GeneralPreferencesViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/GeneralPreferencesViewController.cs
@@ -72,14 +72,14 @@ private void GenerateItems()
             _items.Add(new PreferenceCellItem()
             {
                 Id = "update_frequency_song_position",
-                CellType = PreferenceCellType.Frequency,
+                CellType = PreferenceCellType.Slider,
                 HeaderTitle = "Update Frequency",
                 Title = "Song Position"
             });
             _items.Add(new PreferenceCellItem()
             {
                 Id = "update_frequency_output_meter",
-                CellType = PreferenceCellType.Frequency,
+                CellType = PreferenceCellType.Slider,
                 HeaderTitle = "Update Frequency",
                 Title = "Output Meter",
                 FooterTitle = "Warning: Lower values require more CPU and memory."

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/PlayerViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/PlayerViewController.cs
@@ -260,9 +260,9 @@ public void AddScrollView(UIViewController viewController)
             {
                 viewController.View.Frame = new RectangleF(scrollSubviewsLength * scrollView.Frame.Width, 0, scrollView.Frame.Width, scrollView.Frame.Height);
                 scrollView.AddSubview(viewController.View);
-                //pageControl.Pages = scrollSubviewsLength;
-                pageControl.Pages = 5;
-                scrollView.ContentSize = new SizeF(scrollSubviewsLength * scrollView.Frame.Width, scrollView.Frame.Height);
+                pageControl.Pages = scrollSubviewsLength + 1;
+                //pageControl.Pages = 5;
+                scrollView.ContentSize = new SizeF((scrollSubviewsLength + 1) * scrollView.Frame.Width, scrollView.Frame.Height);
             }
             else
             {

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/SelectPlaylistViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/SelectPlaylistViewController.cs
@@ -34,12 +34,14 @@ namespace MPfm.iOS
     public partial class SelectPlaylistViewController : BaseViewController, ISelectPlaylistView
     {
         List<PlaylistEntity> _items;
+        LibraryBrowserEntity _item;
 
         string _cellIdentifier = "SelectPlaylistCell";
 
-        public SelectPlaylistViewController()
+        public SelectPlaylistViewController(LibraryBrowserEntity item)
 			: base (UserInterfaceIdiomIsPhone ? "SelectPlaylistViewController_iPhone" : "SelectPlaylistViewController_iPad", null)
         {
+            _item = item;
         }
 
         public override void ViewDidLoad()
@@ -55,7 +57,7 @@ public override void ViewDidLoad()
             base.ViewDidLoad();
 
             var navigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>();
-            //navigationManager.BindSelectPlaylistView(this, );
+            navigationManager.BindSelectPlaylistView(this, _item);
         }
 
         partial void actionAddNewPlaylist(NSObject sender)

diff --git a/MPfm/MPfm.iOS/Classes/Objects/PreferenceCellItem.cs b/MPfm/MPfm.iOS/Classes/Objects/PreferenceCellItem.cs
@@ -28,9 +28,12 @@ public class PreferenceCellItem
         public string FooterTitle { get; set; }
         public string Description { get; set; }
         public string IconName { get; set; }
-        public object Value { get; set; }
         public bool Enabled { get; set; }
 
+        public object Value { get; set; }
+        public int MinValue { get; set; }
+        public int MaxValue { get; set; }
+
         public PreferenceCellItem()
         {
             Enabled = true;

diff --git a/MPfm/MPfm.iOS/Classes/Objects/PreferenceCellType.cs b/MPfm/MPfm.iOS/Classes/Objects/PreferenceCellType.cs
@@ -24,6 +24,6 @@ public enum PreferenceCellType
         Boolean = 2,
         String = 3,
         Integer = 4,
-        Frequency = 5
+        Slider = 5
     }
 }