Attachment 59972 Details for Bug 115612

[patch] patch

corruption.diff (text/plain), 2.85 KB, created by Dirk Mueller on 2005-12-06 22:56:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Mueller

Created: 2005-12-06 22:56:08 UTC

Size: 2.85 KB

patch

obsolete

>Index: amarok/src/metabundle.h
>===================================================================
>--- amarok/src/metabundle.h	(revision 485961)
>+++ amarok/src/metabundle.h	(working copy)
>@@ -145,6 +145,8 @@ public:
>     void setBitrate( int bitrate ) { m_bitrate = bitrate; }
>     void setSampleRate( int sampleRate ) { m_sampleRate = sampleRate; }
> 
>+    void detach();
>+
> protected:
>     KURL m_url;
>     QString m_title;
>Index: amarok/src/metabundle.cpp
>===================================================================
>--- amarok/src/metabundle.cpp	(revision 485961)
>+++ amarok/src/metabundle.cpp	(working copy)
>@@ -11,6 +11,7 @@
> #include "metabundle.h"
> #include "playlistitem.h"
> #include <qfile.h> //decodePath()
>+#include <qdeepcopy.h>
> #include <taglib/fileref.h>
> #include <taglib/id3v1genres.h> //used to load genre list
> #include <taglib/mpegfile.h>
>@@ -328,3 +329,18 @@ MetaBundle::genreList() //static
> 
>     return list;
> }
>+
>+void
>+MetaBundle::detach()
>+{
>+    // we'd do that, but unfortunately it does not exist
>+    //m_url.detach();
>+
>+    m_title = QDeepCopy<QString>(m_title);
>+    m_artist = QDeepCopy<QString>(m_artist);
>+    m_album = QDeepCopy<QString>(m_album);
>+    m_comment = QDeepCopy<QString>(m_comment);
>+    m_genre = QDeepCopy<QString>(m_genre);
>+    m_streamName = QDeepCopy<QString>(m_streamName);
>+    m_streamUrl = QDeepCopy<QString>(m_streamUrl);
>+}
>===================================================================
>--- amarok/src/contextbrowser.cpp	(revision 485961)
>+++ amarok/src/contextbrowser.cpp	(working copy)
>@@ -33,6 +33,7 @@
> #include <qregexp.h>
> #include <qtextstream.h>  // External CSS reading
> #include <qvbox.h> //wiki tab
>+#include <qdeepcopy.h>
> 
> #include <kapplication.h> //kapp
> #include <kcalendarsystem.h>  // for verboseTimeSince()
>@@ -1403,9 +1404,7 @@ void ContextBrowser::showHomeByAlbums()
> class CurrentTrackJob : public ThreadWeaver::DependentJob
> {
> public:
>-    CurrentTrackJob( ContextBrowser *parent )
>-            : ThreadWeaver::DependentJob( parent, "CurrentTrackJob" )
>-            , b( parent ) {}
>+    CurrentTrackJob( ContextBrowser *parent );
> 
> private:
>     virtual bool doJob();
>@@ -1426,10 +1425,17 @@ private:
>     }
> 
>     QString m_HTMLSource;
>+    MetaBundle currentTrack;
> 
>     ContextBrowser *b;
> };
> 
>+CurrentTrackJob::CurrentTrackJob( ContextBrowser* parent)
>+    : ThreadWeaver::DependentJob( parent, "CurrentTrackJob" )
>+    , b( parent )
>+{
>+    currentTrack = QDeepCopy<MetaBundle>(EngineController::instance()->bundle());
>+}
> 
> void ContextBrowser::showCurrentTrack() //SLOT
> {
>@@ -1453,8 +1459,6 @@ bool CurrentTrackJob::doJob()
> {
>     DEBUG_BLOCK
> 
>-    const MetaBundle &currentTrack = EngineController::instance()->bundle();
>-
>     m_HTMLSource.append( "<html>"
>                     "<script type='text/javascript'>"
>                       //Toggle visibility of a block. NOTE: if the block ID starts with the T

Actions: View | Diff

Attachments on bug 115612: 49663 | 59765 | 59972 | 91834