banshee r3321 - in trunk/banshee: . src/Libraries/Lastfm/Lastfm

[ahixon svn gnome org]

Author: ahixon
Date: Mon Feb 25 05:27:00 2008
New Revision: 3321
URL: http://svn.gnome.org/viewvc/banshee?rev=3321&view=rev

Log:
2008-02-24  Alexander Hixon  <hixon alexander mediati org>
    * src/Libraries/Lastfm/Lastfm/RadioConnection.cs:
    * src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs: Remove class-
      based UserAgent properties, values and constructor arguments. Use
      LastfmCore.UserAgent instead.
    
    * src/Libraries/Lastfm/Lastfm/LastfmCore.cs: Simplify UserAgent's setter,
      and update instance creation to reflect changes in ctor definitions.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
   trunk/banshee/src/Libraries/Lastfm/Lastfm/LastfmCore.cs
   trunk/banshee/src/Libraries/Lastfm/Lastfm/RadioConnection.cs

Modified: trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs	(original)
+++ trunk/banshee/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs	Mon Feb 25 05:27:00 2008
@@ -62,7 +62,6 @@
         const string SCROBBLER_VERSION = "1.2";
 
         Account account;
-        string user_agent;
         string post_url;
         string session_id = null;
         string now_playing_url;
@@ -76,11 +75,6 @@
         public bool Started {
             get { return started; }
         }
-        
-        public string UserAgent {
-            get { return user_agent; }
-            set { user_agent = value; }
-        }
 
         System.Timers.Timer timer;
         DateTime next_interval;
@@ -96,11 +90,7 @@
         IAsyncResult current_async_result;
         State state;
         
-        internal AudioscrobblerConnection (Account account, IQueue queue) : this (account, queue, "")
-        {
-        }
-        
-        internal AudioscrobblerConnection (Account account, IQueue queue, string user_agent)
+        internal AudioscrobblerConnection (Account account, IQueue queue)
         {
             this.account = account;
             
@@ -108,8 +98,6 @@
             
             state = State.IDLE;
             this.queue = queue;
-            
-            this.user_agent = user_agent;
         }
         
         private void AccountUpdated (object o, EventArgs args)
@@ -273,7 +261,7 @@
             sb.Append (queue.GetTransmitInfo (out num_tracks_transmitted));
 
             current_web_req = (HttpWebRequest) WebRequest.Create (post_url);
-            current_web_req.UserAgent = user_agent;
+            current_web_req.UserAgent = LastfmCore.UserAgent;
             current_web_req.Method = "POST";
             current_web_req.ContentType = "application/x-www-form-urlencoded";
             current_web_req.ContentLength = sb.Length;
@@ -537,7 +525,7 @@
     			                            mbrainzid);
 
                 now_playing_post = (HttpWebRequest) WebRequest.Create (uri);
-                now_playing_post.UserAgent = user_agent;
+                now_playing_post.UserAgent = LastfmCore.UserAgent;
                 now_playing_post.Method = "POST";
                 now_playing_post.ContentType = "application/x-www-form-urlencoded";
                 now_playing_post.ContentLength = uri.Length;

Modified: trunk/banshee/src/Libraries/Lastfm/Lastfm/LastfmCore.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm/Lastfm/LastfmCore.cs	(original)
+++ trunk/banshee/src/Libraries/Lastfm/Lastfm/LastfmCore.cs	Mon Feb 25 05:27:00 2008
@@ -46,23 +46,14 @@
         private static string user_agent;
         public static string UserAgent {
             get { return user_agent; }
-            set {
-                user_agent = value;
-                if (radio != null) {
-                    radio.UserAgent = value;
-                }
-                
-                if (audioscrobbler != null) {
-                    audioscrobbler.UserAgent = value;
-                }
-            }
+            set { user_agent = value; }
         }
         
         private static RadioConnection radio;
         public static RadioConnection Radio {
             get {
                 if (radio == null) {
-                    radio = new RadioConnection (LastfmCore.Account, user_agent);
+                    radio = new RadioConnection (LastfmCore.Account);
                 }
                 
                 return radio;
@@ -84,8 +75,7 @@
                             ("Queue instance must be defined before referencing Audioscrobbler.");
                     }
                     
-                    audioscrobbler = new AudioscrobblerConnection (LastfmCore.Account,queue,
-                        user_agent);
+                    audioscrobbler = new AudioscrobblerConnection (LastfmCore.Account,queue);
                 }
                 
                 return audioscrobbler;

Modified: trunk/banshee/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm/Lastfm/RadioConnection.cs	(original)
+++ trunk/banshee/src/Libraries/Lastfm/Lastfm/RadioConnection.cs	Mon Feb 25 05:27:00 2008
@@ -83,7 +83,6 @@
         public event StateChangedHandler StateChanged;
 
         private ConnectionState state;
-        private string user_agent;
         private string session;
         private string base_url;
         private string base_path;
@@ -97,11 +96,6 @@
             get { return account; }
         }
         
-        public string UserAgent {
-            get { return user_agent; }
-            set { user_agent = value; }
-        }
-        
         private bool subscriber;
         public bool Subscriber {
             get { return subscriber; }
@@ -136,10 +130,9 @@
             get { return station; }
         }
 
-        internal RadioConnection (Account account, string user_agent)
+        internal RadioConnection (Account account)
         {
             this.account = account;
-            this.user_agent = user_agent;
 
             Initialize ();
             State = ConnectionState.Disconnected;
@@ -362,7 +355,7 @@
             }
         
             HttpWebRequest request = (HttpWebRequest) WebRequest.Create (uri);
-            request.UserAgent = user_agent;
+            request.UserAgent = LastfmCore.UserAgent;
             request.Timeout = 10000;
             request.Method = "POST";
             request.KeepAlive = false;
@@ -402,7 +395,7 @@
             if (accept != null) {
                 request.Accept = accept;
             }
-            request.UserAgent = user_agent;
+            request.UserAgent = LastfmCore.UserAgent;
             request.Timeout = 10000;
             request.KeepAlive = false;
             request.AllowAutoRedirect = true;