Bug 91184

Summary: Password protected streams broken
Product: [Applications] amarok Reporter: wef <javapojken>
Component: generalAssignee: Amarok Bugs <amarok-bugs-null>
Status: RESOLVED FIXED    
Severity: normal    
Priority: NOR    
Version First Reported In: 1.1.1   
Target Milestone: ---   
Platform: openSUSE   
OS: Linux   
Latest Commit: Version Fixed In:
Sentry Crash Report:
Attachments: Fix for password protected streams

Description wef 2004-10-12 15:32:04 UTC 
Version:           1.1.1 (using KDE KDE 3.3.0)
Installed from:    SuSE RPMs
OS:                Linux

Two problems using password protected streams, for example those at di.fm:

1. The metadata title streaming is broken, so amarok just hangs and cannot connect to the audio stream either.
2. The password of the protected stream isn't saved in current.xml. This file is saved when amarok is closed, and loaded as the playlist when amarok is started. This means that the loaded playlist won't work.

Created a patch against 1.1.1.

/Olof
Comment 1 wef 2004-10-12 15:33:51 UTC 
Created attachment 7844 [details]
Fix for password protected streams
Comment 2 Mark Kretschmann 2004-10-17 09:36:46 UTC 
CVS commit by markey: 

FIX: Password-protected streams did not work correctly. (BR 91184). Patch by <javapojken@yahoo.se>.

CCMAIL: 91184-done@bugs.kde.org


  M +2 -0      ChangeLog   1.362
  M +1 -1      src/playlist.cpp   1.296
  M +1 -1      src/streamprovider.cpp   1.60


--- kdeextragear-1/amarok/ChangeLog  #1.361:1.362
@@ -5,4 +5,6 @@
 
 VERSION 1.2:
+  FIX: Password-protected streams did not work correctly. (BR 91184).
+       Patch by <javapojken@yahoo.se>.
   ADD: NMM-engine was rewritten and updated for the latest NMM release.
        Supports audio and video playback.

--- kdeextragear-1/amarok/src/playlist.cpp  #1.295:1.296
@@ -1289,5 +1289,5 @@ Playlist::saveXML( const QString &path )
     {
         QDomElement i = newdoc.createElement("item");
-        i.setAttribute("url", item->url().prettyURL());
+        i.setAttribute("url", item->url().url());
 
         for( int x = 1; x < columns(); ++x )

--- kdeextragear-1/amarok/src/streamprovider.cpp  #1.59:1.60
@@ -163,5 +163,5 @@ StreamProvider::sendRequest() //SLOT
                                .arg( m_url.host() )
                                .arg( m_icyMode ? "Icy-MetaData:1\r\n" : "" )
-                               .arg( auth ? "Authorization: Basic " + authString : "" ); 
+                               .arg( auth ? "Authorization: Basic " + authString + "\r\n" : "" ); 
 
 //     kdDebug() << "StreamProvider sending request:\n" << request << endl;