Merge branch 'master' of https://github.com/birkeh/qtJukeBox

cmainwindow.cpp

@@ -100,6 +100,7 @@ cMainWindow::cMainWindow(QWidget *parent) :
 	loadDB();
 	displayDB();
 
+//	addPath("/data/Music");
 //	addPath("C:/Users/vet0572/Music");
 //	addPath("C:/Users/birkeh/Music");
 //	addFile("C:/Users/vet0572/Music/Amy MacDonald/Under Stars (Deluxe)/01 - Dream On.mp3");

cmediainfo.h

@@ -32,6 +32,8 @@
 #include <taglib/synchronizedlyricsframe.h>
 #include <taglib/unsynchronizedlyricsframe.h>
 
+#include <taglib/fileref.h>
+
 #include "ctag.h"
 #include "cstring.h"
 #include "cpixmap.h"

qtJukeBox.pro

@@ -12,9 +12,15 @@ TARGET = qtJukeBox
 TEMPLATE = app
 
 
+win32 {
 INCLUDEPATH += "C:/dev/3rdParty/taglib/include"
 DEPENDPATH += "C:/dev/3rdParty/taglib/include"
 LIBS += "C:/dev/3rdParty/taglib/lib/libtag.dll.a"
+}
+
+unix {
+LIBS	+= -ltag
+}
 
 SOURCES += main.cpp\
         cmainwindow.cpp \
@@ -38,5 +44,3 @@ HEADERS  += cmainwindow.h \
     calbum.h
 
 FORMS    += cmainwindow.ui
-
-#LIBS	+= -ltaglib