pmplib-commits

[Pmplib-commits] SF.net SVN: pmplib: [117] trunk/lib/pmp_portalplayer1/model_samsung.c

[<suc...@us...>]

Revision: 117
Author:   sucknblow
Date:     2006-07-04 08:02:28 -0700 (Tue, 04 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=117&view=rev

Log Message:
-----------
Fix crash bug when using --update option on samsung devices.

The duration of the track seems to be stored as a dword, but
we were treating it as a ucs2 string.

#0  0xb7f482ff in ucs2len (string=0x49) at ucs2char.c:75
#1  0xb7f48c6e in ucs2dupmbs (ucs2str=0x47) at ucs2char.c:389
#2  0xb7f48fc7 in ucs2toi (str=0x47) at ucs2char_iconv.c:148
#3  0xb7b92145 in samsung_dat_get (dst=0x8082698, src=0x806b428, path_to_root=0x8076010)
    at model_samsung.c:142

Modified Paths:
--------------
    trunk/lib/pmp_portalplayer1/model_samsung.c
Modified: trunk/lib/pmp_portalplayer1/model_samsung.c
===================================================================
--- trunk/lib/pmp_portalplayer1/model_samsung.c	2006-07-04 14:39:38 UTC (rev 116)
+++ trunk/lib/pmp_portalplayer1/model_samsung.c	2006-07-04 15:02:28 UTC (rev 117)
@@ -139,7 +139,7 @@
 
 	dst->bitrate = src->fields[PP1DB_DATFIELD_BITRATE].value.dword;
 	dst->sample_rate = src->fields[PP1DB_DATFIELD_SAMPLERATE].value.dword;
-	dst->duration = ucs2toi(src->fields[PP1DB_DATFIELD_DURATION].value.str);
+	dst->duration = src->fields[PP1DB_DATFIELD_DURATION].value.dword;
 
 	dst->artist = ucs2dup(src->fields[PP1DB_DATFIELD_ARTIST].value.str);
 	dst->album = ucs2dup(src->fields[PP1DB_DATFIELD_ALBUM].value.str);


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

[Pmplib-commits] SF.net SVN: pmplib: [118] trunk/lib/pmp_portalplayer1/model_samsung.c

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

Revision: 118
Author:   nyaochi
Date:     2006-07-04 20:18:00 -0700 (Tue, 04 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=118&view=rev

Log Message:
-----------
[Samsung players only]
Use PP1DB_DATFIELD_UNKNOWN4 (#14) field to store timestamps (last-modified time) of media files.
I forgot to test the possibility of using this field for storing timestamps. In other words, the
update mode for Samsung players had not been implemented properly.

Although this field seems to be unused (set to zero), this change might cause a trouble to players
if this field were actually used.

Modified Paths:
--------------
    trunk/lib/pmp_portalplayer1/model_samsung.c
Modified: trunk/lib/pmp_portalplayer1/model_samsung.c
===================================================================
--- trunk/lib/pmp_portalplayer1/model_samsung.c	2006-07-04 15:02:28 UTC (rev 117)
+++ trunk/lib/pmp_portalplayer1/model_samsung.c	2006-07-05 03:18:00 UTC (rev 118)
@@ -110,7 +110,7 @@
 		dst->fields[PP1DB_DATFIELD_YEAR].value.dword = ucs2toi(src->date);
 	}
 	dst->fields[PP1DB_DATFIELD_FILESIZE].value.dword = src->filesize;
-	dst->fields[PP1DB_DATFIELD_UNKNOWN4].value.dword = 0;
+	dst->fields[PP1DB_DATFIELD_UNKNOWN4].value.dword = src->ts_update;
 	dst->fields[PP1DB_DATFIELD_UNKNOWN5].value.str = ucs2dup(ucs2cs_empty);
 	dst->fields[PP1DB_DATFIELD_UNKNOWN6].value.str = ucs2dup(ucs2cs_empty);
 	dst->fields[PP1DB_DATFIELD_UNKNOWN7].value.str = ucs2dup(ucs2cs_empty);
@@ -159,6 +159,7 @@
 	itoucs2(src->fields[PP1DB_DATFIELD_YEAR].value.dword, tmp, 10);
 	dst->date = ucs2dup(tmp);
 	dst->filesize = src->fields[PP1DB_DATFIELD_FILESIZE].value.dword;
+	dst->ts_update = src->fields[PP1DB_DATFIELD_UNKNOWN4].value.dword;
 
 	return 0;
 }


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