From 57ade50488e251593fd0898e46da9ec2c2cb0506 Mon Sep 17 00:00:00 2001 From: doublerebel Date: Sat, 16 Apr 2011 17:47:06 -0700 Subject: [PATCH] Updated version, changelog, JVA repo link, screenshot; removed scan whitespace --- CHANGES_s-xwax | 13 +++++++++---- README.markdown | 8 +++++--- scan | 2 +- xwax.c | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGES_s-xwax b/CHANGES_s-xwax index 5046841..7496a27 100644 --- a/CHANGES_s-xwax +++ b/CHANGES_s-xwax @@ -1,11 +1,16 @@ -v0.2 +0.1b ----------------------- -* Updated for xwax v0.9-beta5 +* Updated for xwax 0.9-beta6+ * 'Played tracks' crate (Yves Adler) +* Album art displayed in track browser +* Album art thumbnail script +* Corrected scan regex +* Playlist scanner installs automatically +* Added OpenSUSE font path -v0.1 +0.1a ----------------------- -* based on xwax v0.9-beta4 (by Mark Hills) +* based on xwax 0.9-beta4 (by Mark Hills) * based on xwaxed v0.1 (by Sighter/JVA) * Vertical stacked waveforms * Information overlay over waveforms diff --git a/README.markdown b/README.markdown index cc398aa..0423572 100644 --- a/README.markdown +++ b/README.markdown @@ -9,7 +9,7 @@ Built from [the latest xwax beta](http://www.xwax.co.uk/devel/xwax.git) * Original source by Mark Hills - * Deck info UI by [Sighter/JVA](http://sighter.ath.cx/cgit/cgit.cgi/xwaxed/?h=played_tracks) + * Deck info UI by [Sighter/JVA](http://sighter.ath.cx/cgit/cgit.cgi/xwaxed/) * Deck protection patch by [Yves Adler](https://github.com/yadler/xwax-yadler) @@ -19,9 +19,11 @@ Built from [the latest xwax beta](http://www.xwax.co.uk/devel/xwax.git) * XSPF and PLS playlist scanner by Charles Phillips -[Screenshot of s-xwax 0.1a](http://www.doublerebel.com/images/s-xwax0.1a.png) +**Screenshots:** -*Video tearing due to lack of vsync in SDL 1.2, upgrading to 1.3 is in the TODO* + * [Screenshot of s-xwax 0.1a](http://www.doublerebel.com/images/s-xwax0.1a.png) *Video tearing due to lack of vsync in SDL 1.2, upgrading to 1.3 is in the TODO* + + * [Screenshot of s-xwax 0.1b](http://www.doublerebel.com/images/Screenshot_s-xwax-0.1b.png) New album art feature reads **folder.jpg** from the folder containing the audio file. The script **albumart** can be used to recursively diff --git a/scan b/scan index a5480bd..fa01833 100755 --- a/scan +++ b/scan @@ -58,7 +58,7 @@ s:/\([AB0-9]\+.\?[ _]\+\)\?\([^/]*\)\.[A-Z0-9]*$:\0\t\t\2:pi ' else if [ $EXT = "pls" ]; then - #skip the first two lines + #skip the first two lines #treat the entire file as a single record #remove all unneeded .PLS lines #put Title on the same line as Filename with tab separation diff --git a/xwax.c b/xwax.c index 897015a..afeb6ed 100644 --- a/xwax.c +++ b/xwax.c @@ -51,7 +51,7 @@ #define DEFAULT_SCANNER EXECDIR "/xwax-scan" #define DEFAULT_TIMECODE "serato_2a" -char *banner = "xwax " VERSION \ +char *banner = "s-xwax " VERSION \ " (C) Copyright 2011 Charles Phillips "; static void usage(FILE *fd)