# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1188772413 -10800
# Node ID 4b2c76a8dda73e4b345345a34f51faa156f64d4a
# Parent  5e4393a4c099e02b81ab9cc119b9ad7ce47e04dc# Parent  58f03e54b97ab4198f7ce5bd72867529c7798cb0
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 5e4393a4c099 -r 4b2c76a8dda7 src/modplug/modplugbmp.cxx
--- a/src/modplug/modplugbmp.cxx	Mon Sep 03 01:26:49 2007 +0300
+++ b/src/modplug/modplugbmp.cxx	Mon Sep 03 01:33:33 2007 +0300
@@ -491,16 +491,6 @@
 	return (float32)mOutPlug->output_time() / 1000;
 }
 
-void ModplugXMMS::GetSongInfo(const string& aFilename, char*& aTitle, int32& aLength)
-{
-	aLength = -1;
-        *aTitle = NULL;
-
-        Tuple* ti = GetSongTuple( aFilename );
-        if ( ti )
-                aTitle = format_and_free_ti( ti, &aLength );
-}
-
 Tuple* ModplugXMMS::GetSongTuple(const string& aFilename)
 {
 	CSoundFile* lSoundFile;
@@ -535,13 +525,13 @@
 		tuple_associate_string(ti, "codec", "OctaMed");
 		break;
 	case MOD_TYPE_MTM:
-		tuple_associate_string(ti, "codec", "MTM");
+		tuple_associate_string(ti, "codec", "MultiTracker Module");
 		break;
 	case MOD_TYPE_669:
 		tuple_associate_string(ti, "codec", "669 Composer / UNIS 669");
 		break;
 	case MOD_TYPE_ULT:
-		tuple_associate_string(ti, "codec", "ULT");
+		tuple_associate_string(ti, "codec", "Ultra Tracker");
 		break;
 	case MOD_TYPE_STM:
 		tuple_associate_string(ti, "codec", "Scream Tracker");
@@ -574,13 +564,13 @@
 		tuple_associate_string(ti, "codec", "DigiBooster Pro");
 		break;
 	case MOD_TYPE_MT2:
-		tuple_associate_string(ti, "codec", "MT2");
+		tuple_associate_string(ti, "codec", "MadTracker 2");
 		break;
 	case MOD_TYPE_AMF0:
 		tuple_associate_string(ti, "codec", "AMF0");
 		break;
 	case MOD_TYPE_PSM:
-		tuple_associate_string(ti, "codec", "PSM");
+		tuple_associate_string(ti, "codec", "Protracker Studio Module");
 		break;
 	default:
 		tuple_associate_string(ti, "codec", "ModPlug unknown");
diff -r 5e4393a4c099 -r 4b2c76a8dda7 src/modplug/modplugbmp.h
--- a/src/modplug/modplugbmp.h	Mon Sep 03 01:26:49 2007 +0300
+++ b/src/modplug/modplugbmp.h	Mon Sep 03 01:33:33 2007 +0300
@@ -99,7 +99,6 @@
 	void Seek(float32 aTime);                // Seek to the specified time.
 	float32 GetTime();                   // Get the current play time.
 
-	void GetSongInfo(const string& aFilename, char*& aTitle, int32& aLength); // Function to grab the title string
 	Tuple* GetSongTuple(const string& aFilename);
 
 	void SetInputPlugin(InputPlugin& aInPlugin);
diff -r 5e4393a4c099 -r 4b2c76a8dda7 src/modplug/plugin.cxx
--- a/src/modplug/plugin.cxx	Mon Sep 03 01:26:49 2007 +0300
+++ b/src/modplug/plugin.cxx	Mon Sep 03 01:33:33 2007 +0300
@@ -60,11 +60,6 @@
 		return (int)(lTime * 1000);
 }
 
-static void GetSongInfo(char* aFilename, char** aTitle, int* aLength)
-{
-	gModplugXMMS.GetSongInfo(aFilename, *aTitle, *aLength);
-}
-
 static Tuple* GetSongTuple(char* aFilename)
 {
 	return gModplugXMMS.GetSongTuple(aFilename);
@@ -113,7 +108,7 @@
 	NULL,
 	NULL,
 	NULL,
-	GetSongInfo,
+	NULL,
 	ShowFileInfoBox,
 	NULL,	// output
 	GetSongTuple,