Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [306] trunk/pmplib
|
From: <ny...@us...> - 2007-02-07 14:12:59
|
Revision: 306
http://svn.sourceforge.net/pmplib/?rev=306&view=rev
Author: nyaochi
Date: 2007-02-07 06:11:15 -0800 (Wed, 07 Feb 2007)
Log Message:
-----------
Do not use id3_file_open_fd() since it leaks file objects in Win32 environment.
Use id3_file_open() instead even though this may lose some information in filenames during UCS-2 -> MBS conversion.
Modified Paths:
--------------
trunk/pmplib/lib/gmi/gmi_mp3.c
trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
trunk/pmplib/pmp.sln
Modified: trunk/pmplib/lib/gmi/gmi_mp3.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_mp3.c 2007-02-07 12:33:41 UTC (rev 305)
+++ trunk/pmplib/lib/gmi/gmi_mp3.c 2007-02-07 14:11:15 UTC (rev 306)
@@ -333,18 +333,12 @@
ucs2char_t* ucs2 = NULL;
struct id3_file *id3file = NULL;
struct id3_tag *id3tag = NULL;
- FILE *fp = NULL;
+ char *mbs_filename = ucs2dupmbs(filename);
- /* 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_fdopen(fileno(fp), ID3_FILE_MODE_READONLY);
+ id3file = id3_file_open(mbs_filename, ID3_FILE_MODE_READONLY);
+ ucs2free(mbs_filename);
if (!id3file) {
- fclose(fp);
return -1;
}
Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.c 2007-02-07 12:33:41 UTC (rev 305)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.c 2007-02-07 14:11:15 UTC (rev 306)
@@ -165,7 +165,6 @@
ip2db_record_t* ip2db_records = NULL;
static const ucs2char_t ucs2cs_unknown[] = {'u','n','k','n','o','w','n',0};
- fprintf(stdout, "records = %d, num_records = %d\n", records, num_records);
// Count valid entries.
for (i = 0;i < num_records;++i) {
if (ip2db_is_supported_codec(records[i].codec)) {
Modified: trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-02-07 12:33:41 UTC (rev 305)
+++ trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c 2007-02-07 14:11:15 UTC (rev 306)
@@ -71,7 +71,7 @@
"System\\E10.SYS", "System\\db.dat", "System\\db.dic", "System\\db.idx",
".mp3\0.ogg\0.wma\0.wav\0",
{PMPCODEC_MPEGLAYER3, PMPCODEC_VORBIS, PMPCODEC_WMA, PMPCODEC_WAV, 0, 0, 0, 0},
- "System\\", "", "Playlists\\",
+ "System", "", "Playlists",
".plp",
},
{
Modified: trunk/pmplib/pmp.sln
===================================================================
--- trunk/pmplib/pmp.sln 2007-02-07 12:33:41 UTC (rev 305)
+++ trunk/pmplib/pmp.sln 2007-02-07 14:11:15 UTC (rev 306)
@@ -14,8 +14,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmp", "lib\pmp\pmp.vcproj", "{8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A}"
ProjectSection(ProjectDependencies) = postProject
+ {FA6E7B73-7CF8-47DD-A016-77382A1FD904} = {FA6E7B73-7CF8-47DD-A016-77382A1FD904}
{AA8DA82B-C209-4ABE-ABA1-22352962426D} = {AA8DA82B-C209-4ABE-ABA1-22352962426D}
- {FA6E7B73-7CF8-47DD-A016-77382A1FD904} = {FA6E7B73-7CF8-47DD-A016-77382A1FD904}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmp_irivnavi", "lib\pmp_irivnavi\pmp_irivnavi.vcproj", "{2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1}"
@@ -35,18 +35,18 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "easypmp_cui", "frontend\easypmp\cui\easypmp_cui.vcproj", "{FA1F30D4-6100-4379-8506-6CFE023B0AE7}"
ProjectSection(ProjectDependencies) = postProject
+ {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A} = {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A}
+ {3575EFC2-9051-467A-BEB4-E71E2F8664D7} = {3575EFC2-9051-467A-BEB4-E71E2F8664D7}
{3419FA86-F518-4D3B-94C6-B05436439102} = {3419FA86-F518-4D3B-94C6-B05436439102}
- {3575EFC2-9051-467A-BEB4-E71E2F8664D7} = {3575EFC2-9051-467A-BEB4-E71E2F8664D7}
- {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A} = {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "easypmp_win32gui", "frontend\easypmp\win32gui\easypmp_win32gui.vcproj", "{45CCFC7B-42B4-4FF9-AF43-FC3626B1672F}"
ProjectSection(ProjectDependencies) = postProject
+ {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A} = {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A}
+ {3575EFC2-9051-467A-BEB4-E71E2F8664D7} = {3575EFC2-9051-467A-BEB4-E71E2F8664D7}
+ {3419FA86-F518-4D3B-94C6-B05436439102} = {3419FA86-F518-4D3B-94C6-B05436439102}
+ {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1} = {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1}
{E393575C-6B10-43BD-B2C0-63C5040A49F7} = {E393575C-6B10-43BD-B2C0-63C5040A49F7}
- {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1} = {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1}
- {3419FA86-F518-4D3B-94C6-B05436439102} = {3419FA86-F518-4D3B-94C6-B05436439102}
- {3575EFC2-9051-467A-BEB4-E71E2F8664D7} = {3575EFC2-9051-467A-BEB4-E71E2F8664D7}
- {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A} = {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmp_portalplayer1", "lib\pmp_portalplayer1\pmp_portalplayer1.vcproj", "{544769C2-6989-452F-B626-E442CAC6553B}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
