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

List:       kde-commits
Subject:    make-it-snow: kdemultimedia/noatun/library
From:       Charles Samuels <charles () kde ! org>
Date:       2005-03-22 20:20:42
Message-ID: 20050322202042.99BF63C3 () office ! kde ! org
[Download RAW message or body]

CVS commit by charles: 

this fixes streaming for last.fm
two backports pending


  M +6 -7      engine.cpp   1.101.2.12
  M +4 -3      titleproxy.cpp   1.3.2.1
  M +1 -1      noatun/engine.h   1.5.2.7


--- kdemultimedia/noatun/library/engine.cpp  #1.101.2.11:1.101.2.12
@@ -322,9 +322,9 @@ bool Engine::open(const PlaylistItem &fi
         if (file.isProperty("stream_") && file.url().protocol() == "http")
         {
-                deleteProxy();
+                delete d->pProxy;
                 d->pProxy = new TitleProxy::Proxy(KURL(file.property("stream_")));
                 d->playobj = d->factory->createPlayObject(d->pProxy->proxyUrl(), false);
 
-                connect(d->playobj, SIGNAL(destroyed()), this, SLOT(deleteProxy()));
+                connect(d->playobj, SIGNAL(destroyed()), this, SLOT(proxyDeleted()));
                 connect(
                         d->pProxy, SIGNAL(
@@ -374,12 +374,11 @@ void Engine::slotProxyError()
 {
         kdDebug(66666) << k_funcinfo << endl;
+        delete d->pProxy;
         emit playingFailed();
-        deleteProxy();
 }
 
 
-void Engine::deleteProxy()
+void Engine::proxyDeleted()
 {
-        delete d->pProxy;
         d->pProxy = 0;
 }
@@ -392,5 +391,5 @@ void Engine::connectPlayObject()
                 kdDebug(66666) << k_funcinfo << "INVALID PLAYOBJECT" << endl;
                 emit playingFailed();
-                deleteProxy();
+                delete d->pProxy;
                 return;
         }

--- kdemultimedia/noatun/library/titleproxy.cpp  #1.3:1.3.2.1
@@ -152,5 +152,5 @@ void Proxy::sendRequest() //SLOT
         bool auth = !( username.isEmpty() && password.isEmpty() );
 
-        QString request = QString( "GET %1 HTTP/1.0\r\n"
+        QString request = QString( "GET %1%6 HTTP/1.0\r\n"
                 "Host: %2\r\n"
                 "User-Agent: Noatun/%5\r\n"
@@ -162,5 +162,6 @@ void Proxy::sendRequest() //SLOT
                 .arg( m_icyMode ? QString( "Icy-MetaData:1\r\n" ) : QString::null )
                 .arg( auth ? QString( "Authorization: Basic " ).append( authString ) : QString::null )
-                .arg( NOATUN_VERSION );
+                .arg( NOATUN_VERSION )
+                .arg(m_url.query());
 
         m_sockRemote.writeBlock( request.latin1(), request.length() );
@@ -217,5 +218,5 @@ void Proxy::readRemote() //SLOT
                         bytesWrite = m_sockProxy.writeBlock( m_pBuf + index, bytesWrite );
 
-                        if ( bytesWrite == -1 )
+                        if ( bytesWrite <= 0 )
                         {
                                 error();

--- kdemultimedia/noatun/library/noatun/engine.h  #1.5.2.6:1.5.2.7
@@ -87,5 +87,5 @@ signals:
 private slots:
         void slotProxyError();
-        void deleteProxy();
+        void proxyDeleted();
 
 public:


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