Install listenlive.xml file, and dont embed into app

This commit is contained in:
craig.p.drummond
2014-03-21 20:08:53 +00:00
committed by craig.p.drummond
parent 111fee020c
commit 0d3f14d2cd
4 changed files with 8 additions and 3 deletions

View File

@@ -68,6 +68,7 @@
only show cover and tite in context view. No attempt is made to get artist,
album, or song information - as these are likely to fail anyway.
44. Jamendo radio streams.
45. Install listenlive.xml to Cantata folder, as opposed to embedding in app.
1.3.3
-----

View File

@@ -1,7 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file alias="weblinks.xml">context/weblinks.xml</file>
<file alias="listenlive.xml">streams/listenlive.xml</file>
<file alias="repeat16.png">icons/view-media-repeat16.png</file>
<file alias="repeat22.png">icons/view-media-repeat22.png</file>

View File

@@ -1864,7 +1864,12 @@ bool StreamsModel::loadFavourites(const QString &fileName, const QModelIndex &in
void StreamsModel::buildListenLive(const QModelIndex &index)
{
QFile f(":listenlive.xml");
#ifdef Q_OS_WIN
QFile f(QCoreApplication::applicationDirPath()+"/streams/listenlive.xml");
#else
QFile f(INSTALL_PREFIX "/share/cantata/streams/listenlive.xml");
#endif
if (f.open(QIODevice::ReadOnly)) {
CategoryItem *top=new CategoryItem(QString());
CategoryItem *region=top;

View File

@@ -9,4 +9,4 @@ install(FILES 1.fm.xml.gz DESTINATION ${STREAM_PROVIDER_PREFIX}/1.fm RENAME stre
install(FILES ../../online/icons/jamendo.svg DESTINATION ${STREAM_PROVIDER_PREFIX}/Jamendo RENAME icon.svg)
install(FILES jamendo.xml.gz DESTINATION ${STREAM_PROVIDER_PREFIX}/Jamendo RENAME streams.xml.gz)
install(FILES ../listenlive.xml DESTINATION ${STREAM_PROVIDER_PREFIX})