Attachment #59972 for bug #115612

View | Details | Raw Unified | Return to bug 115612
Collapse All | Expand All

Lines 145-150 public: Link Here

(-)amarok/src/metabundle.h (+2 lines)
145	void setBitrate( int bitrate ) { m_bitrate = bitrate; }	145	void setBitrate( int bitrate ) { m_bitrate = bitrate; }
146	void setSampleRate( int sampleRate ) { m_sampleRate = sampleRate; }	146	void setSampleRate( int sampleRate ) { m_sampleRate = sampleRate; }
147		147
		148	void detach();
		149
148	protected:	150	protected:
149	KURL m_url;	151	KURL m_url;
150	QString m_title;	152	QString m_title;




#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>


    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);
}




#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()

class CurrentTrackJob : public ThreadWeaver::DependentJob
{
public:
    CurrentTrackJob( ContextBrowser *parent );
            : ThreadWeaver::DependentJob( parent, "CurrentTrackJob" )
            , b( parent ) {}

private:
    virtual bool doJob();

    }

    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
{

{
    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

Return to bug 115612

Lines 33-38 Link Here

(-)amarok/src/contextbrowser.cpp (-5 / +9 lines)
33	#include <qregexp.h>	33	#include <qregexp.h>
34	#include <qtextstream.h> // External CSS reading	34	#include <qtextstream.h> // External CSS reading
35	#include <qvbox.h> //wiki tab	35	#include <qvbox.h> //wiki tab
		36	#include <qdeepcopy.h>
36		37
37	#include <kapplication.h> //kapp	38	#include <kapplication.h> //kapp
38	#include <kcalendarsystem.h> // for verboseTimeSince()	39	#include <kcalendarsystem.h> // for verboseTimeSince()
Lines 1403-1411 void ContextBrowser::showHomeByAlbums() Link Here
1403	class CurrentTrackJob : public ThreadWeaver::DependentJob	1404	class CurrentTrackJob : public ThreadWeaver::DependentJob
1404	{	1405	{
1405	public:	1406	public:
1406	CurrentTrackJob( ContextBrowser *parent )	1407	CurrentTrackJob( ContextBrowser *parent );
1407	: ThreadWeaver::DependentJob( parent, "CurrentTrackJob" )
1408	, b( parent ) {}
1409		1408
1410	private:	1409	private:
1411	virtual bool doJob();	1410	virtual bool doJob();
Lines 1426-1435 private: Link Here
1426	}	1425	}
1427		1426
1428	QString m_HTMLSource;	1427	QString m_HTMLSource;
		1428	MetaBundle currentTrack;
1429		1429
1430	ContextBrowser *b;	1430	ContextBrowser *b;
1431	};	1431	};
1432		1432
		1433	CurrentTrackJob::CurrentTrackJob( ContextBrowser* parent)
		1434	: ThreadWeaver::DependentJob( parent, "CurrentTrackJob" )
		1435	, b( parent )
		1436	{
		1437	currentTrack = QDeepCopy<MetaBundle>(EngineController::instance()->bundle());
		1438	}
1433		1439
1434	void ContextBrowser::showCurrentTrack() //SLOT	1440	void ContextBrowser::showCurrentTrack() //SLOT
1435	{	1441	{
Lines 1453-1460 bool CurrentTrackJob::doJob() Link Here
1453	{	1459	{
1454	DEBUG_BLOCK	1460	DEBUG_BLOCK
1455		1461
1456	const MetaBundle &currentTrack = EngineController::instance()->bundle();
1457
1458	m_HTMLSource.append( "<html>"	1462	m_HTMLSource.append( "<html>"
1459	"<script type='text/javascript'>"	1463	"<script type='text/javascript'>"
1460	//Toggle visibility of a block. NOTE: if the block ID starts with the T	1464	//Toggle visibility of a block. NOTE: if the block ID starts with the T

Lines 11-16 Link Here

(-)amarok/src/metabundle.cpp (+16 lines)
11	#include "metabundle.h"	11	#include "metabundle.h"
12	#include "playlistitem.h"	12	#include "playlistitem.h"
13	#include <qfile.h> //decodePath()	13	#include <qfile.h> //decodePath()
		14	#include <qdeepcopy.h>
14	#include <taglib/fileref.h>	15	#include <taglib/fileref.h>
15	#include <taglib/id3v1genres.h> //used to load genre list	16	#include <taglib/id3v1genres.h> //used to load genre list
16	#include <taglib/mpegfile.h>	17	#include <taglib/mpegfile.h>
Lines 328-330 MetaBundle::genreList() //static Link Here
328		329
329	return list;	330	return list;
330	}	331	}
		332
		333	void
		334	MetaBundle::detach()
		335	{
		336	// we'd do that, but unfortunately it does not exist
		337	//m_url.detach();
		338
		339	m_title = QDeepCopy<QString>(m_title);
		340	m_artist = QDeepCopy<QString>(m_artist);
		341	m_album = QDeepCopy<QString>(m_album);
		342	m_comment = QDeepCopy<QString>(m_comment);
		343	m_genre = QDeepCopy<QString>(m_genre);
		344	m_streamName = QDeepCopy<QString>(m_streamName);
		345	m_streamUrl = QDeepCopy<QString>(m_streamUrl);
		346	}