Index: /winamp-musepack/trunk/winamp-musepack/mpc_player.cpp
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_player.cpp	(revision 188)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_player.cpp	(revision 189)
@@ -6,4 +6,5 @@
 #include <mpc/minimax.h>
 
+#include <tag.h>
 
 mpc_player::mpc_player(In_Module * in_mod)
@@ -31,4 +32,5 @@
 	mod = in_mod;
 	wait_event = 0;
+	tag_file = 0;
 }
 
@@ -57,4 +59,8 @@
 		demux = 0;
 		mpc_reader_exit_stdio(&reader);
+	}
+	if (tag_file != 0) {
+		delete tag_file;
+		tag_file = 0;
 	}
 }
@@ -158,7 +164,21 @@
 	if (length_in_ms) *length_in_ms = getLength();
 	if (title) {
-		char *p = lastfn + strlen(lastfn);
-		while (*p != '\\' && p >= lastfn) p--;
-		strcpy(title,++p);
+		if(tag_file == 0)
+			tag_file = new TagLib::FileRef(lastfn, false);
+
+		if (tag_file->isNull() || !tag_file->tag()) {
+			char *p = lastfn + strlen(lastfn);
+			while (*p != '\\' && p >= lastfn) p--;
+			strcpy(title,++p);
+		} else {
+			TagLib::Tag *tag = tag_file->tag();
+			sprintf(title, "%s - %s", tag->artist().toCString(), tag->title().toCString());
+			//tag->artist()
+			//tag->album()
+			//tag->year()
+			//tag->comment()
+			//tag->track()
+			//tag->genre()
+		}
 	}
 }
Index: /winamp-musepack/trunk/winamp-musepack/mpc_player.h
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_player.h	(revision 188)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_player.h	(revision 189)
@@ -2,4 +2,5 @@
 
 #include <mpcdec/mpcdec.h>
+#include <fileref.h>
 
 // post this to the main window at end of file (after playback as stopped)
@@ -30,4 +31,6 @@
 	mpc_reader reader;
 	mpc_demux* demux;
+	TagLib::FileRef * tag_file;
+
     MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH];
 
Index: /winamp-musepack/trunk/winamp-musepack/winamp-musepack.vcproj
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/winamp-musepack.vcproj	(revision 188)
+++ /winamp-musepack/trunk/winamp-musepack/winamp-musepack.vcproj	(revision 189)
@@ -38,5 +38,5 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libmpc\include"
+				AdditionalIncludeDirectories="..\..\libmpc\include;C:\Program Files\taglib\include\taglib"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
 				DebugInformationFormat="1"
@@ -53,9 +53,9 @@
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib libmpcdec_d.lib libcommon_d.lib"
+				AdditionalDependencies="User32.lib libmpcdec_d.lib libcommon_d.lib tag.lib"
 				OutputFile="E:\Program Files\Winamp\Plugins\in_mpc.dll"
-				AdditionalLibraryDirectories="..\..\libmpc\win32\Debug"
+				AdditionalLibraryDirectories="..\..\libmpc\win32\Debug;C:\Program Files\taglib\lib"
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBCMTD"
+				IgnoreDefaultLibraryNames="LIBCMTD;MSVCRT"
 				GenerateDebugInformation="true"
 			/>