Index: /winamp-musepack/trunk/winamp-musepack/in_mpc.cpp
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/in_mpc.cpp	(revision 190)
+++ /winamp-musepack/trunk/winamp-musepack/in_mpc.cpp	(revision 191)
@@ -185,6 +185,6 @@
 int infoDlg(char *fn, HWND hwnd)
 {
-	// CHANGEME! Write your own info dialog code here
-	return 0;
+	mpc_player info_play(fn, &mod);
+	return info_play.infoDlg(hwnd);
 }
 
Index: /winamp-musepack/trunk/winamp-musepack/mpc_info.cpp
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_info.cpp	(revision 191)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_info.cpp	(revision 191)
@@ -0,0 +1,2 @@
+#include "mpc_info.h"
+
Index: /winamp-musepack/trunk/winamp-musepack/mpc_info.h
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_info.h	(revision 191)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_info.h	(revision 191)
@@ -0,0 +1,344 @@
+#pragma once
+
+using namespace System;
+using namespace System::ComponentModel;
+using namespace System::Collections;
+using namespace System::Windows::Forms;
+using namespace System::Data;
+using namespace System::Drawing;
+
+
+namespace winamp_musepack {
+
+	/// <summary>
+	/// Summary for mpc_info
+	///
+	/// WARNING: If you change the name of this class, you will need to change the
+	///          'Resource File Name' property for the managed resource compiler tool
+	///          associated with all .resx files this class depends on.  Otherwise,
+	///          the designers will not be able to interact properly with localized
+	///          resources associated with this form.
+	/// </summary>
+	public ref class mpc_info : public System::Windows::Forms::Form
+	{
+	public:
+		mpc_info(void)
+		{
+			InitializeComponent();
+			//
+			//TODO: Add the constructor code here
+			//
+		}
+
+	protected:
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		~mpc_info()
+		{
+			if (components)
+			{
+				delete components;
+			}
+		}
+	private: System::Windows::Forms::GroupBox^  groupBox1;
+	public: System::Windows::Forms::TextBox^  txtTrack;
+	private: 
+
+	protected: 
+
+	private: System::Windows::Forms::Label^  label5;
+	public: System::Windows::Forms::TextBox^  txtYear;
+	private: 
+
+
+	private: System::Windows::Forms::Label^  label4;
+	public: System::Windows::Forms::TextBox^  txtAlbum;
+	private: 
+
+
+	private: System::Windows::Forms::Label^  label3;
+	public: System::Windows::Forms::TextBox^  txtArtist;
+	private: 
+
+
+	private: System::Windows::Forms::Label^  label2;
+	public: System::Windows::Forms::TextBox^  txtTitle;
+	private: 
+
+
+	private: System::Windows::Forms::Label^  label1;
+	private: System::Windows::Forms::GroupBox^  groupBox2;
+	public: System::Windows::Forms::TextBox^  txtComment;
+	private: 
+
+
+	private: System::Windows::Forms::Label^  label6;
+	private: System::Windows::Forms::Label^  label7;
+	public: System::Windows::Forms::ComboBox^  comboGenre;
+	private: 
+	public: System::Windows::Forms::Label^  lblStreamInfo;
+	private: System::Windows::Forms::Button^  btnReload;
+	public: 
+
+	private: System::Windows::Forms::Button^  btnCancel;
+	public: 
+
+	private: System::Windows::Forms::Button^  btnUpdate;
+
+
+
+
+
+	private:
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		System::ComponentModel::Container ^components;
+
+#pragma region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		void InitializeComponent(void)
+		{
+			this->groupBox1 = (gcnew System::Windows::Forms::GroupBox());
+			this->label7 = (gcnew System::Windows::Forms::Label());
+			this->comboGenre = (gcnew System::Windows::Forms::ComboBox());
+			this->txtComment = (gcnew System::Windows::Forms::TextBox());
+			this->label6 = (gcnew System::Windows::Forms::Label());
+			this->txtTrack = (gcnew System::Windows::Forms::TextBox());
+			this->label5 = (gcnew System::Windows::Forms::Label());
+			this->txtYear = (gcnew System::Windows::Forms::TextBox());
+			this->label4 = (gcnew System::Windows::Forms::Label());
+			this->txtAlbum = (gcnew System::Windows::Forms::TextBox());
+			this->label3 = (gcnew System::Windows::Forms::Label());
+			this->txtArtist = (gcnew System::Windows::Forms::TextBox());
+			this->label2 = (gcnew System::Windows::Forms::Label());
+			this->txtTitle = (gcnew System::Windows::Forms::TextBox());
+			this->label1 = (gcnew System::Windows::Forms::Label());
+			this->groupBox2 = (gcnew System::Windows::Forms::GroupBox());
+			this->lblStreamInfo = (gcnew System::Windows::Forms::Label());
+			this->btnReload = (gcnew System::Windows::Forms::Button());
+			this->btnCancel = (gcnew System::Windows::Forms::Button());
+			this->btnUpdate = (gcnew System::Windows::Forms::Button());
+			this->groupBox1->SuspendLayout();
+			this->groupBox2->SuspendLayout();
+			this->SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this->groupBox1->Controls->Add(this->label7);
+			this->groupBox1->Controls->Add(this->comboGenre);
+			this->groupBox1->Controls->Add(this->txtComment);
+			this->groupBox1->Controls->Add(this->label6);
+			this->groupBox1->Controls->Add(this->txtTrack);
+			this->groupBox1->Controls->Add(this->label5);
+			this->groupBox1->Controls->Add(this->txtYear);
+			this->groupBox1->Controls->Add(this->label4);
+			this->groupBox1->Controls->Add(this->txtAlbum);
+			this->groupBox1->Controls->Add(this->label3);
+			this->groupBox1->Controls->Add(this->txtArtist);
+			this->groupBox1->Controls->Add(this->label2);
+			this->groupBox1->Controls->Add(this->txtTitle);
+			this->groupBox1->Controls->Add(this->label1);
+			this->groupBox1->Location = System::Drawing::Point(12, 12);
+			this->groupBox1->Name = L"groupBox1";
+			this->groupBox1->Size = System::Drawing::Size(354, 183);
+			this->groupBox1->TabIndex = 0;
+			this->groupBox1->TabStop = false;
+			this->groupBox1->Text = L"Tag information";
+			// 
+			// label7
+			// 
+			this->label7->AutoSize = true;
+			this->label7->Location = System::Drawing::Point(186, 100);
+			this->label7->Name = L"label7";
+			this->label7->Size = System::Drawing::Size(36, 13);
+			this->label7->TabIndex = 13;
+			this->label7->Text = L"Genre";
+			this->label7->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// comboGenre
+			// 
+			this->comboGenre->FormattingEnabled = true;
+			this->comboGenre->Location = System::Drawing::Point(228, 96);
+			this->comboGenre->Name = L"comboGenre";
+			this->comboGenre->Size = System::Drawing::Size(120, 21);
+			this->comboGenre->TabIndex = 12;
+			// 
+			// txtComment
+			// 
+			this->txtComment->Location = System::Drawing::Point(63, 123);
+			this->txtComment->Multiline = true;
+			this->txtComment->Name = L"txtComment";
+			this->txtComment->Size = System::Drawing::Size(285, 54);
+			this->txtComment->TabIndex = 11;
+			// 
+			// label6
+			// 
+			this->label6->AutoSize = true;
+			this->label6->Location = System::Drawing::Point(6, 126);
+			this->label6->Name = L"label6";
+			this->label6->Size = System::Drawing::Size(51, 13);
+			this->label6->TabIndex = 10;
+			this->label6->Text = L"Comment";
+			this->label6->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// txtTrack
+			// 
+			this->txtTrack->Location = System::Drawing::Point(160, 97);
+			this->txtTrack->Name = L"txtTrack";
+			this->txtTrack->Size = System::Drawing::Size(21, 20);
+			this->txtTrack->TabIndex = 9;
+			// 
+			// label5
+			// 
+			this->label5->AutoSize = true;
+			this->label5->Location = System::Drawing::Point(109, 100);
+			this->label5->Name = L"label5";
+			this->label5->Size = System::Drawing::Size(45, 13);
+			this->label5->TabIndex = 8;
+			this->label5->Text = L"Track #";
+			this->label5->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// txtYear
+			// 
+			this->txtYear->Location = System::Drawing::Point(63, 97);
+			this->txtYear->Name = L"txtYear";
+			this->txtYear->Size = System::Drawing::Size(40, 20);
+			this->txtYear->TabIndex = 7;
+			// 
+			// label4
+			// 
+			this->label4->AutoSize = true;
+			this->label4->Location = System::Drawing::Point(28, 100);
+			this->label4->Name = L"label4";
+			this->label4->Size = System::Drawing::Size(29, 13);
+			this->label4->TabIndex = 6;
+			this->label4->Text = L"Year";
+			this->label4->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// txtAlbum
+			// 
+			this->txtAlbum->Location = System::Drawing::Point(63, 71);
+			this->txtAlbum->Name = L"txtAlbum";
+			this->txtAlbum->Size = System::Drawing::Size(285, 20);
+			this->txtAlbum->TabIndex = 5;
+			// 
+			// label3
+			// 
+			this->label3->AutoSize = true;
+			this->label3->Location = System::Drawing::Point(21, 74);
+			this->label3->Name = L"label3";
+			this->label3->Size = System::Drawing::Size(36, 13);
+			this->label3->TabIndex = 4;
+			this->label3->Text = L"Album";
+			this->label3->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// txtArtist
+			// 
+			this->txtArtist->Location = System::Drawing::Point(63, 45);
+			this->txtArtist->Name = L"txtArtist";
+			this->txtArtist->Size = System::Drawing::Size(285, 20);
+			this->txtArtist->TabIndex = 3;
+			// 
+			// label2
+			// 
+			this->label2->AutoSize = true;
+			this->label2->Location = System::Drawing::Point(27, 48);
+			this->label2->Name = L"label2";
+			this->label2->Size = System::Drawing::Size(30, 13);
+			this->label2->TabIndex = 2;
+			this->label2->Text = L"Artist";
+			this->label2->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// txtTitle
+			// 
+			this->txtTitle->Location = System::Drawing::Point(63, 19);
+			this->txtTitle->Name = L"txtTitle";
+			this->txtTitle->Size = System::Drawing::Size(285, 20);
+			this->txtTitle->TabIndex = 1;
+			// 
+			// label1
+			// 
+			this->label1->AutoSize = true;
+			this->label1->Location = System::Drawing::Point(30, 22);
+			this->label1->Name = L"label1";
+			this->label1->Size = System::Drawing::Size(27, 13);
+			this->label1->TabIndex = 0;
+			this->label1->Text = L"Title";
+			this->label1->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
+			// 
+			// groupBox2
+			// 
+			this->groupBox2->Controls->Add(this->lblStreamInfo);
+			this->groupBox2->Location = System::Drawing::Point(372, 12);
+			this->groupBox2->Name = L"groupBox2";
+			this->groupBox2->Size = System::Drawing::Size(149, 212);
+			this->groupBox2->TabIndex = 1;
+			this->groupBox2->TabStop = false;
+			this->groupBox2->Text = L"Stream information";
+			// 
+			// lblStreamInfo
+			// 
+			this->lblStreamInfo->AutoEllipsis = true;
+			this->lblStreamInfo->Location = System::Drawing::Point(6, 16);
+			this->lblStreamInfo->Name = L"lblStreamInfo";
+			this->lblStreamInfo->Size = System::Drawing::Size(137, 190);
+			this->lblStreamInfo->TabIndex = 0;
+			this->lblStreamInfo->Text = L"lblStreamInfo";
+			// 
+			// btnReload
+			// 
+			this->btnReload->Location = System::Drawing::Point(282, 201);
+			this->btnReload->Name = L"btnReload";
+			this->btnReload->Size = System::Drawing::Size(84, 23);
+			this->btnReload->TabIndex = 2;
+			this->btnReload->Text = L"Reload";
+			this->btnReload->UseVisualStyleBackColor = true;
+			// 
+			// btnCancel
+			// 
+			this->btnCancel->Location = System::Drawing::Point(147, 201);
+			this->btnCancel->Name = L"btnCancel";
+			this->btnCancel->Size = System::Drawing::Size(84, 23);
+			this->btnCancel->TabIndex = 3;
+			this->btnCancel->Text = L"Cancel";
+			this->btnCancel->UseVisualStyleBackColor = true;
+			this->btnCancel->Click += gcnew System::EventHandler(this, &mpc_info::btnCancel_Click);
+			// 
+			// btnUpdate
+			// 
+			this->btnUpdate->Location = System::Drawing::Point(12, 201);
+			this->btnUpdate->Name = L"btnUpdate";
+			this->btnUpdate->Size = System::Drawing::Size(84, 23);
+			this->btnUpdate->TabIndex = 4;
+			this->btnUpdate->Text = L"Update";
+			this->btnUpdate->UseVisualStyleBackColor = true;
+			// 
+			// mpc_info
+			// 
+			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
+			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
+			this->ClientSize = System::Drawing::Size(534, 237);
+			this->Controls->Add(this->btnUpdate);
+			this->Controls->Add(this->btnCancel);
+			this->Controls->Add(this->btnReload);
+			this->Controls->Add(this->groupBox2);
+			this->Controls->Add(this->groupBox1);
+			this->Name = L"mpc_info";
+			this->Text = L"Musepack file information";
+			this->groupBox1->ResumeLayout(false);
+			this->groupBox1->PerformLayout();
+			this->groupBox2->ResumeLayout(false);
+			this->ResumeLayout(false);
+
+		}
+#pragma endregion
+private: System::Void btnCancel_Click(System::Object^  sender, System::EventArgs^  e) {
+			 Close();
+		 }
+};
+}
Index: /winamp-musepack/trunk/winamp-musepack/mpc_info.resx
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_info.resx	(revision 191)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_info.resx	(revision 191)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
Index: /winamp-musepack/trunk/winamp-musepack/mpc_player.cpp
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_player.cpp	(revision 190)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_player.cpp	(revision 191)
@@ -19,10 +19,14 @@
 
 #include <windows.h>
+#include <math.h>
 
 #include "in2.h"
 #include "mpc_player.h"
 #include <mpc/minimax.h>
+#include "mpc_info.h"
 
 #include <tag.h>
+
+using namespace winamp_musepack;
 
 mpc_player::mpc_player(In_Module * in_mod)
@@ -209,5 +213,5 @@
 		if (wait_event) SetEvent(wait_event);
 		if (WaitForSingleObject(thread_handle,10000) == WAIT_TIMEOUT) {
-			MessageBox(mod->hMainWindow,"error asking thread to die!\n",
+			MessageBoxA(mod->hMainWindow,"error asking thread to die!\n",
 				"error killing decode thread", 0);
 			TerminateThread(thread_handle, 0);
@@ -266,2 +270,49 @@
 	return 0; 
 }
+
+int mpc_player::infoDlg(HWND hwnd)
+{
+	mpc_info infoBox;
+	System::String ^ tmp;
+
+	tmp = "Streamversion ";
+	tmp += si.stream_version;
+	tmp += "\nEncoder : ";
+	tmp += gcnew String(si.encoder);
+	tmp += "\nProfile : ";
+	tmp += gcnew String(si.profile_name);
+	tmp += "\nPNS : ";
+	tmp += si.pns ? "on" : "off";
+	tmp += "\nGapless : ";
+	tmp += si.is_true_gapless ? "on" : "off";
+	tmp += "\nAverage bitrate : ";
+	tmp += floor(si.average_bitrate * 1.e-3 + .5);
+	tmp += " Kbps \nSamplerate : ";
+	tmp += si.sample_freq;
+	tmp += "\nChannels : ";
+	tmp += si.channels;
+	tmp += "\nFile size : ";
+	tmp += si.total_file_length;
+	tmp += " Bytes";
+	// FIXME : add replay gain info
+
+	infoBox.lblStreamInfo->Text = tmp;
+
+
+	if(tag_file == 0)
+		tag_file = new TagLib::FileRef(lastfn, false);
+
+	if (!tag_file->isNull() && tag_file->tag()) {
+		TagLib::Tag *tag = tag_file->tag();
+		infoBox.txtTitle->Text = gcnew String(tag->title().toCString(true));
+		infoBox.txtArtist->Text = gcnew String(tag->artist().toCString(true));
+		infoBox.txtAlbum->Text = gcnew String(tag->album().toCString(true));
+		infoBox.txtYear->Text += tag->year();
+		infoBox.txtTrack->Text += tag->track();
+		infoBox.comboGenre->Text = gcnew String(tag->genre().toCString(true));
+		infoBox.txtComment->Text = gcnew String(tag->comment().toCString(true));
+	}
+
+	infoBox.ShowDialog();
+	return 0;
+}
Index: /winamp-musepack/trunk/winamp-musepack/mpc_player.h
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/mpc_player.h	(revision 190)
+++ /winamp-musepack/trunk/winamp-musepack/mpc_player.h	(revision 191)
@@ -43,4 +43,6 @@
 	void setOutputTime(int time_in_ms);
 
+	int infoDlg(HWND hwnd);
+
 	int paused;				// are we paused?
 
Index: /winamp-musepack/trunk/winamp-musepack/winamp-musepack.vcproj
===================================================================
--- /winamp-musepack/trunk/winamp-musepack/winamp-musepack.vcproj	(revision 190)
+++ /winamp-musepack/trunk/winamp-musepack/winamp-musepack.vcproj	(revision 191)
@@ -5,4 +5,5 @@
 	Name="winamp-musepack"
 	ProjectGUID="{EEA7D671-FB86-4E8D-8F1A-CC05174342F0}"
+	RootNamespace="winamp-musepack"
 	>
 	<Platforms>
@@ -40,4 +41,6 @@
 				AdditionalIncludeDirectories="..\..\libmpc\include;C:\Program Files\taglib\include\taglib"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				WarningLevel="3"
 				DebugInformationFormat="1"
 			/>
@@ -56,6 +59,7 @@
 				OutputFile="E:\Program Files\Winamp\Plugins\in_mpc.dll"
 				AdditionalLibraryDirectories="..\..\libmpc\win32\Debug;C:\Program Files\taglib\lib"
+				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBCMTD;MSVCRT"
+				IgnoreDefaultLibraryNames="LIBCMTD;MSVCRT;MSVCMRT"
 				GenerateDebugInformation="true"
 			/>
@@ -87,6 +91,7 @@
 		<Configuration
 			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			>
 			<Tool
@@ -107,4 +112,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\libmpc\include;C:\Program Files\taglib\include\taglib"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				WarningLevel="1"
 			/>
 			<Tool
@@ -119,4 +128,9 @@
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="User32.lib libmpcdec.lib libcommon.lib tag.lib"
+				OutputFile="E:\Program Files\Winamp\Plugins\in_mpc.dll"
+				AdditionalLibraryDirectories="..\..\libmpc\win32\Release;C:\Program Files\taglib\lib"
+				GenerateManifest="true"
+				IgnoreDefaultLibraryNames="LIBCMT"
 			/>
 			<Tool
@@ -147,4 +161,24 @@
 	</Configurations>
 	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+		/>
 	</References>
 	<Files>
@@ -159,6 +193,54 @@
 			</File>
 			<File
+				RelativePath=".\mpc_info.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						MinimalRebuild="false"
+						ExceptionHandling="2"
+						BasicRuntimeChecks="0"
+						UsePrecompiledHeader="0"
+						DebugInformationFormat="3"
+						CompileAsManaged="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						MinimalRebuild="false"
+						ExceptionHandling="2"
+						BasicRuntimeChecks="0"
+						UsePrecompiledHeader="0"
+						DebugInformationFormat="3"
+						CompileAsManaged="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath=".\mpc_player.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ExceptionHandling="2"
+						CompileAsManaged="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ExceptionHandling="2"
+						CompileAsManaged="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
@@ -173,4 +255,14 @@
 			</File>
 			<File
+				RelativePath=".\mpc_info.h"
+				FileType="3"
+				>
+				<File
+					RelativePath=".\mpc_info.resx"
+					SubType="Designer"
+					>
+				</File>
+			</File>
+			<File
 				RelativePath=".\mpc_player.h"
 				>