pmplib-commits

[Pmplib-commits] SF.net SVN: pmplib: [290] trunk/pmplib/lib/gmi/gmi_mp3.c

[<ny...@us...>]

Revision: 290
          http://svn.sourceforge.net/pmplib/?rev=290&view=rev
Author:   nyaochi
Date:     2007-01-27 01:03:05 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
Patch from jonof at the forum:
http://nyaochi.sakura.ne.jp/pmplib/index.php?topic=210.msg910#msg910

Modified Paths:
--------------
    trunk/pmplib/lib/gmi/gmi_mp3.c

Modified: trunk/pmplib/lib/gmi/gmi_mp3.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_mp3.c	2007-01-27 09:00:28 UTC (rev 289)
+++ trunk/pmplib/lib/gmi/gmi_mp3.c	2007-01-27 09:03:05 UTC (rev 290)
@@ -327,7 +327,6 @@
 int gmi_mp3(media_info_t* info, const ucs2char_t *filename)
 {
 	int i, num_tags = 0;
-	FILE *fp = NULL;
 	mp3header_t mp3header;
 	uint32_t tn = 0;
 	static const ucs2char_t ucs2_empty[1] = {0};
@@ -340,7 +339,6 @@
 	id3file = id3_file_open(pathname, ID3_FILE_MODE_READONLY);
 	ucs2free(pathname);
 	if (!id3file) {
-		fclose(fp);
 		return -1;
 	}
 


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

[Pmplib-commits] SF.net SVN: pmplib: [294] trunk/pmplib/lib/gmi/gmi_mp3.c

[<ny...@us...>]

Revision: 294
          http://svn.sourceforge.net/pmplib/?rev=294&view=rev
Author:   nyaochi
Date:     2007-01-28 14:46:02 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
Moved back to the old code; let libid3tag to manage the file pointer opened for id3_file_fdopen().
I got a bug report from a user who seems to utilize a non-native UNICODE path/file name on Win32.

Modified Paths:
--------------
    trunk/pmplib/lib/gmi/gmi_mp3.c

Modified: trunk/pmplib/lib/gmi/gmi_mp3.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_mp3.c	2007-01-28 22:30:55 UTC (rev 293)
+++ trunk/pmplib/lib/gmi/gmi_mp3.c	2007-01-28 22:46:02 UTC (rev 294)
@@ -333,12 +333,18 @@
 	ucs2char_t* ucs2 = NULL;
 	struct id3_file *id3file = NULL;
 	struct id3_tag *id3tag = NULL;
-	char* pathname = ucs2dupmbs(filename);
+	FILE *fp = NULL;
 
+	/* Open the file with UNICODE filename. This is for better compatibility. */ 	 
+	fp = ucs2fopen(filename, "rb");
+	if (!fp) {
+		return -1; 	 
+	}
+
 	/* Open with libid3tag */
-	id3file = id3_file_open(pathname, ID3_FILE_MODE_READONLY);
-	ucs2free(pathname);
+	id3file = id3_file_fdopen(fileno(fp), ID3_FILE_MODE_READONLY);
 	if (!id3file) {
+		fclose(fp);
 		return -1;
 	}
 


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