[banshee] IBasicPlaybackController: rename userRequested -> changeImmediately

[Christopher James Halse Rogers <chrishr src gnome org>]

commit c10a476291235689fe4856ccf54d5b65f6f0cfc9
Author: Christopher James Halse Rogers <chrishr src gnome org>
Date:   Sun Mar 14 21:05:46 2010 +1100

    IBasicPlaybackController: rename userRequested -> changeImmediately

 .../IBasicPlaybackController.cs                    |    2 +-
 .../PlaybackControllerService.cs                   |   12 ++++++------
 .../Banshee.InternetRadio/InternetRadioSource.cs   |    6 +++---
 .../Banshee.Lastfm.Radio/StationSource.cs          |    4 ++--
 .../Banshee.PlayQueue/PlayQueueSource.cs           |    8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/IBasicPlaybackController.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/IBasicPlaybackController.cs
index 9825f8a..a7bcba2 100644
--- a/src/Core/Banshee.Services/Banshee.PlaybackController/IBasicPlaybackController.cs
+++ b/src/Core/Banshee.Services/Banshee.PlaybackController/IBasicPlaybackController.cs
@@ -31,7 +31,7 @@ namespace Banshee.PlaybackController
     public interface IBasicPlaybackController
     {
         bool First ();
-        bool Next (bool restart, bool userRequested);
+        bool Next (bool restart, bool changeImmediately);
         bool Previous (bool restart);
     }
 }
diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
index c65153a..8dfb9fc 100644
--- a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+++ b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
@@ -234,20 +234,20 @@ namespace Banshee.PlaybackController
             Next (restart, true);
         }
 
-        public void Next (bool restart, bool userRequested)
+        public void Next (bool restart, bool changeImmediately)
         {
             CancelErrorTransition ();
 
             Source = NextSource;
             raise_started_after_transition = true;
 
-            if (userRequested) {
+            if (changeImmediately) {
                 player_engine.IncrementLastPlayed ();
             }
 
-            if (Source is IBasicPlaybackController && ((IBasicPlaybackController)Source).Next (restart, userRequested)) {
+            if (Source is IBasicPlaybackController && ((IBasicPlaybackController)Source).Next (restart, changeImmediately)) {
             } else {
-                ((IBasicPlaybackController)this).Next (restart, userRequested);
+                ((IBasicPlaybackController)this).Next (restart, changeImmediately);
             }
 
             OnTransition ();
@@ -307,14 +307,14 @@ namespace Banshee.PlaybackController
             return true;
         }
 
-        bool IBasicPlaybackController.Next (bool restart, bool userRequested)
+        bool IBasicPlaybackController.Next (bool restart, bool changeImmediately)
         {
             if (CurrentTrack != null) {
                 previous_stack.Push (CurrentTrack);
             }
 
             CurrentTrack = CalcNextTrack (Direction.Next, restart);
-            if (!userRequested) {
+            if (!changeImmediately) {
                 // A RequestNextTrack event should always result in SetNextTrack being called.  null is acceptable.
                 player_engine.SetNextTrack (CurrentTrack);
             } else if (CurrentTrack != null) {
diff --git a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
index f2d993b..46863fe 100644
--- a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
+++ b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
@@ -277,15 +277,15 @@ namespace Banshee.InternetRadio
             return false;
         }
 
-        public bool Next (bool restart, bool userRequested)
+        public bool Next (bool restart, bool changeImmediately)
         {
             /*
-             * TODO: It should be technically possible to handle userRequested=False
+             * TODO: It should be technically possible to handle changeImmediately=False
              * correctly here, but the current implementation is quite hostile.
              * For the moment, just SetNextTrack (null), and go on to OpenPlay if
              * the engine isn't currently playing.
              */
-            if (!userRequested) {
+            if (!changeImmediately) {
                 ServiceManager.PlayerEngine.SetNextTrack ((SafeUri)null);
                 if (ServiceManager.PlayerEngine.IsPlaying ()) {
                     return true;
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
index 746349b..f584dd3 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
@@ -298,10 +298,10 @@ namespace Banshee.Lastfm.Radio
         }
 
         private bool playback_requested;
-        bool IBasicPlaybackController.Next (bool restart, bool userRequested)
+        bool IBasicPlaybackController.Next (bool restart, bool changeImmediately)
         {
             TrackInfo next = NextTrack;
-            if (userRequested) {
+            if (changeImmediately) {
                 if (next != null) {
                     ServiceManager.PlayerEngine.OpenPlay (next);
                 }  else {
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
index 22aac30..de9c88f 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
@@ -540,7 +540,7 @@ namespace Banshee.PlayQueue
             return ((IBasicPlaybackController)this).Next (false, true);
         }
 
-        bool IBasicPlaybackController.Next (bool restart, bool userRequested)
+        bool IBasicPlaybackController.Next (bool restart, bool changeImmediately)
         {
             if (current_track != null && ServiceManager.PlayerEngine.CurrentTrack == current_track) {
                 int index = TrackModel.IndexOf (current_track) + 1;
@@ -551,9 +551,9 @@ namespace Banshee.PlayQueue
                 ServiceManager.PlaybackController.Source = PriorSource;
                 if (was_playing) {
                     ServiceManager.PlaybackController.PriorTrack = prior_playback_track;
-                    ServiceManager.PlaybackController.Next (restart, userRequested);
+                    ServiceManager.PlaybackController.Next (restart, changeImmediately);
                 } else {
-                    if (!userRequested) {
+                    if (!changeImmediately) {
                         ServiceManager.PlayerEngine.SetNextTrack ((TrackInfo)null);
                     }
                     ServiceManager.PlayerEngine.Close ();
@@ -561,7 +561,7 @@ namespace Banshee.PlayQueue
                 return true;
             }
 
-            if (userRequested) {
+            if (changeImmediately) {
                 ServiceManager.PlayerEngine.OpenPlay (current_track);
             } else {
                 ServiceManager.PlayerEngine.SetNextTrack (current_track);