Hi.
This patch fixes a bug introduced in changeset 96 where non-mp3 tune
files are given an incorrect offset.
Wave files are no longer given an offset but I don't think that they
are needed. They play fine without one.
I have also put back the unlink() which was mistakenly removed in
changeset 100.
Keith.
# HG changeset patch
# User Keith Bennett <[EMAIL PROTECTED]>
# Node ID 974350f4455da1d41197a1abbb2e2874fe738737
# Parent 1c62d333b1053acf4b8a5cf9ea5429baa69efcec
Fixed bug in setting the offset for ogg files.
Reverted accidental removal of the unlink() for duplicated tunes.
diff -r 1c62d333b105 -r 974350f4455d src/rio_rw.c
--- a/src/rio_rw.c Tue Aug 15 23:17:13 2006 +0200
+++ b/src/rio_rw.c Thu Aug 17 10:11:59 2006 +0100
@@ -168,6 +168,10 @@
fids = lk_properties_andOrSearch(EXACT|ORS, NULL, "rid", rid);
if (fids != NULL) {
+ if (usb) {
+ unlink(filename);
+ free(filename);
+ }
free(fids);
lk_errors_set(E_DUPE);
return -1;
@@ -187,7 +191,6 @@
}
add_general(props, filename);
- lk_properties_set_property_hash(props, "offset", simple_itoa(mp3.offset));
lk_properties_set_property_hash(props, "rid", rid);
if (type == TYPE_OGG)
@@ -324,6 +327,7 @@
lk_properties_set_property_hash(p, "type", "tune");
lk_properties_set_property_hash(p, "codec", "mp3");
+ lk_properties_set_property_hash(p, "offset", simple_itoa(mp3->offset));
/*default values*/
lk_properties_set_property_hash(p, "genre", NOT_TAGGED);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
linux-karma-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-karma-devel
