diff options
author | waker <wakeroid@gmail.com> | 2009-08-20 21:06:43 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2009-08-20 21:06:43 +0200 |
commit | da5f0b416df7d721310ef07f3006da561174a712 (patch) | |
tree | f3cb0166b3e7c2917b331bb2926131fcea8f17bc | |
parent | 429f0b3d8b051fd992166fcfcd4a38e9aa763833 (diff) |
fixed bug in cvorbis_init preventing some songs from playing
-rw-r--r-- | cvorbis.c | 3 | ||||
-rwxr-xr-x | insertlicense.sh | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -60,7 +60,7 @@ cvorbis_init (struct playItem_s *it) { cvorbis.info.channels = vi->channels; cvorbis.info.samplesPerSecond = vi->rate; cvorbis.info.readposition = 0; - if (timeend > 0) { + if (it->timeend > 0) { timestart = it->timestart; timeend = it->timeend; cvorbis_seek (0); @@ -69,7 +69,6 @@ cvorbis_init (struct playItem_s *it) { timestart = 0; timeend = it->duration; } -// printf ("vorbis info: bps: %d, size: %d, chan: %d, rate: %d, dur: %f\n", cvorbis.info.bitsPerSample, cvorbis.info.dataSize, cvorbis.info.channels, cvorbis.info.samplesPerSecond, cvorbis.info.duration); return 0; } diff --git a/insertlicense.sh b/insertlicense.sh index 53400b91..904e10cd 100755 --- a/insertlicense.sh +++ b/insertlicense.sh @@ -2,12 +2,14 @@ echo "IMPORTANT: Hit C-c if you forgot to backup/commit stuff!!!" read ls *.c *.h *.cpp | while read i; do - if grep --silent "DO NOT EDIT" "$i" || grep --silent "DeaDBeeF - ultimate music player for GNU/Linux systems with X11" "$i" ; then + if [ "$i" == "config.h" ] || grep --silent "DO NOT EDIT" "$i" ; then + echo "skipping $i (blacklist)" + elif grep --silent "DeaDBeeF - ultimate music player for GNU/Linux systems with X11" "$i" ; then if grep --silent "version 3 of the License" "$i" ; then echo "changing $i to gpl2" sed -i 's/version 3 of the License/version 2 of the License/' "$i" else - echo "skipping file $i" + echo "skipping $i (already has license)" fi else echo "adding license text to $i" |