[OMPT-svn-commit] SF.net SVN: modplug:[3394] trunk/OpenMPT

[<man...@us...>]

Revision: 3394
          http://sourceforge.net/p/modplug/code/3394
Author:   manxorist
Date:     2013-12-06 09:31:14 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
[Mod] libopenmpt: Rename metadata key 'author' to 'artist'.
[Ref] libopenmpt: Correct filenames in comments.

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/in_openmpt.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
    trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
    trunk/OpenMPT/openmpt123/openmpt123_flac.hpp
    trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp

Modified: trunk/OpenMPT/libopenmpt/in_openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.cpp	2013-12-06 06:50:02 UTC (rev 3393)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.cpp	2013-12-06 09:31:14 UTC (rev 3394)
@@ -1,6 +1,6 @@
 /*
- * libopenmpt_winamp.cpp
- * ---------------------
+ * in_openmpt.cpp
+ * --------------
  * Purpose: libopenmpt winamp input plugin implementation
  * Notes  : (currently none)
  * Authors: OpenMPT Devs

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-12-06 06:50:02 UTC (rev 3393)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-12-06 09:31:14 UTC (rev 3394)
@@ -630,7 +630,7 @@
 	retval.push_back("container");
 	retval.push_back("container_long");
 	retval.push_back("tracker");
-	retval.push_back("author");
+	retval.push_back("artist");
 	retval.push_back("title");
 	retval.push_back("message");
 	retval.push_back("warnings");

Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp	2013-12-06 06:50:02 UTC (rev 3393)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp	2013-12-06 09:31:14 UTC (rev 3394)
@@ -1,6 +1,6 @@
 /*
- * libopenmpt_xmplay.cpp
- * ---------------------
+ * xmp-openmpt.cpp
+ * ---------------
  * Purpose: libopenmpt xmplay input plugin implementation
  * Notes  : (currently none)
  * Authors: OpenMPT Devs
@@ -424,7 +424,7 @@
 
 static void write_xmplay_tags( char * tags[8], const openmpt::module & mod ) {
 	write_xmplay_tag( &tags[0], convert_to_native( mod.get_metadata("title") ) );
-	write_xmplay_tag( &tags[1], convert_to_native( mod.get_metadata("author") ) );
+	write_xmplay_tag( &tags[1], convert_to_native( mod.get_metadata("artist") ) );
 	write_xmplay_tag( &tags[2], convert_to_native( mod.get_metadata("xmplay-album") ) ); // todo, libopenmpt does not support that
 	write_xmplay_tag( &tags[3], convert_to_native( mod.get_metadata("xmplay-date") ) ); // todo, libopenmpt does not support that
 	write_xmplay_tag( &tags[4], convert_to_native( mod.get_metadata("xmplay-tracknumber") ) ); // todo, libopenmpt does not support that

Modified: trunk/OpenMPT/openmpt123/openmpt123_flac.hpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123_flac.hpp	2013-12-06 06:50:02 UTC (rev 3393)
+++ trunk/OpenMPT/openmpt123/openmpt123_flac.hpp	2013-12-06 09:31:14 UTC (rev 3394)
@@ -66,7 +66,7 @@
 		}
 		tags.clear();
 		tags.push_back( std::make_pair( "TITLE", metadata[ "title" ] ) );
-		tags.push_back( std::make_pair( "ARTIST", metadata[ "author" ] ) );
+		tags.push_back( std::make_pair( "ARTIST", metadata[ "artist" ] ) );
 		tags.push_back( std::make_pair( "COMMENT", metadata[ "message" ] ) );
 		if ( !metadata[ "type" ].empty() && !metadata[ "tracker" ].empty() ) {
 			tags.push_back( std::make_pair( "SOURCEMEDIA", std::string() + "'" + metadata[ "type" ] + "' tracked music file, made with '" + metadata[ "tracker" ] + "', rendered with '" + get_encoder_tag() + "'" ) );

Modified: trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp	2013-12-06 06:50:02 UTC (rev 3393)
+++ trunk/OpenMPT/openmpt123/openmpt123_sndfile.hpp	2013-12-06 09:31:14 UTC (rev 3394)
@@ -176,7 +176,7 @@
 	}
 	void write_metadata( std::map<std::string,std::string> metadata ) {
 		write_metadata_field( SF_STR_TITLE, metadata[ "title" ] );
-		write_metadata_field( SF_STR_ARTIST, metadata[ "author" ] );
+		write_metadata_field( SF_STR_ARTIST, metadata[ "artist" ] );
 		write_metadata_field( SF_STR_COMMENT, metadata[ "message" ] );
 		write_metadata_field( SF_STR_SOFTWARE, append_software_tag( metadata[ "tracker" ] ) );
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.