[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Mark Kretschmann <markey () web ! de>
Date:       2005-03-31 21:01:48
Message-ID: 20050331210148.149DB629 () office ! kde ! org
[Download RAW message or body]

CVS commit by markey: 

Extract client version from APP_VERSION.


  M +10 -2     streamprovider.cpp   1.75


--- kdeextragear-1/amarok/src/streamprovider.cpp  #1.74:1.75
@@ -18,4 +18,5 @@ email                : markey@web.de
 #define DEBUG_PREFIX "StreamProvider"
 
+#include "amarok.h"
 #include "amarokconfig.h"
 #include "debug.h"
@@ -23,4 +24,5 @@ email                : markey@web.de
 #include "streamprovider.h"
 
+#include <qregexp.h>
 #include <qtextcodec.h>
 #include <qtimer.h>
@@ -153,13 +155,19 @@ StreamProvider::sendRequest() //SLOT
     const bool auth = !( username.isEmpty() && password.isEmpty() );
 
+    // Extract major+minor version number from APP_VERSION
+    QRegExp reg( "[0-9]*\.[0-9]*" );
+    reg.search( APP_VERSION );
+    const QString version = reg.cap();
+
     const QString request = QString( "GET %1 HTTP/1.0\r\n"
                                      "Host: %2\r\n"
-                                     "User-Agent: amaroK/1.2\r\n"
+                                     "User-Agent: amaroK/%3\r\n"
                                      "Accept: */*\r\n"
-                                     "%3"
                                      "%4"
+                                     "%5"
                                      "\r\n" )
                                      .arg( m_url.path( -1 ).isEmpty() ? "/" : \
                m_url.path( -1 ) + m_url.query() )
                                      .arg( m_url.host() )
+                                     .arg( version )
                                      .arg( m_icyMode ? "Icy-MetaData:1\r\n" : "" )
                                      .arg( auth ? "Authorization: Basic " + \
authString + "\r\n" : "" );


[prev in list] [next in list] [prev in thread] [next in thread]