|
From: Jordan S. <js...@jw...> - 2003-07-16 16:45:01
|
At 02:50 PM 7/15/2003, Arion Lawrence wrote: >Attached is a patch to Streamsicle v2.0 that adds support for viewing >pictures embedded within MP3 files. The ID3v2.3 standard provides a clear >description of how these pictures should be embedded and extracted from an >ID3 frame titled 'APIC'. The patch included here will display any >embedded picture below the currently playing song -- and in the ID3 >details screen. [snip] >Let me know if you have any questions. Hopefully this patch will make its >way into the Streamsicle CVS tree... I tried applying your patch to the current CVS tree, but there were more than a few problems: # patch -ubp 1 < APIC-support-v2.patch patching file src/com/streamsicle/Streamsicle.java Hunk #1 FAILED at 3. Hunk #2 FAILED at 526. 2 out of 2 hunks FAILED -- saving rejects to file src/com/streamsicle/Streamsicle.java.rej patching file src/com/streamsicle/fluid/InteractiveStream.java Hunk #1 FAILED at 627. 1 out of 1 hunk FAILED -- saving rejects to file src/com/streamsicle/fluid/InteractiveStream.java.rej patching file src/com/streamsicle/songinfo/SongInfo.java Hunk #1 FAILED at 207. Hunk #2 FAILED at 452. 2 out of 2 hunks FAILED -- saving rejects to file src/com/streamsicle/songinfo/SongInfo.java.rej patching file src/com/streamsicle/songinfo/SongInfoDegenerate.java Hunk #1 FAILED at 240. 1 out of 1 hunk FAILED -- saving rejects to file src/com/streamsicle/songinfo/SongInfoDegenerate.java.rej patching file src/com/streamsicle/songinfo/SongInfoFile.java Hunk #1 FAILED at 253. 1 out of 1 hunk FAILED -- saving rejects to file src/com/streamsicle/songinfo/SongInfoFile.java.rej patching file src/com/streamsicle/songinfo/SongInfoID3v1.java Hunk #1 FAILED at 439. 1 out of 1 hunk FAILED -- saving rejects to file src/com/streamsicle/songinfo/SongInfoID3v1.java.rej patching file src/com/streamsicle/songinfo/SongInfoID3v2.java Hunk #1 FAILED at 1. Hunk #2 FAILED at 45. Hunk #3 FAILED at 148. Hunk #4 FAILED at 395. 4 out of 4 hunks FAILED -- saving rejects to file src/com/streamsicle/songinfo/SongInfoID3v2.java.rej patching file web/look_default/songInfo.jsp Hunk #1 FAILED at 191. 1 out of 1 hunk FAILED -- saving rejects to file web/look_default/songInfo.jsp.rej patching file web/look_default/streamStatusInc.jsp Hunk #1 FAILED at 1. Hunk #2 succeeded at 9 (offset 1 line). patch unexpectedly ends in middle of line Hunk #3 succeeded at 52 with fuzz 1 (offset 1 line). 1 out of 3 hunks FAILED -- saving rejects to file web/look_default/streamStatusInc.jsp.rej Do you suppose you could make a patch against the current CVS tree? I can tar it up for you if you like, but doing a CVS checkout is pretty straightforward. It's explained on this page: http://sourceforge.net/cvs/?group_id=25251 Alternately, it's entirely possible that I have no idea how to apply a patch properly, so if you have pointers on that, that'd be swell too. :) Jordan |