From 614a5152dfb6f039a866e431873d293d571ebd90 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Thu, 30 Apr 2009 15:01:50 +0200 Subject: [PATCH 2/3] Changed format for song files. --- converter | 7 +++++++ player.cpp | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100755 converter diff --git a/converter b/converter new file mode 100755 index 0000000..400ccbc --- /dev/null +++ b/converter @@ -0,0 +1,7 @@ +#!/bin/sh +if [ ! $# -eq 2 ]; then + echo "Usage: $0 " 1>&2 + exit 1 +fi + +perl -pe 'y/bulhx/h_.\-^/' < $1 > $2 diff --git a/player.cpp b/player.cpp index bf2a380..f5d5492 100644 --- a/player.cpp +++ b/player.cpp @@ -226,19 +226,20 @@ void play (const char *const song) case 'f': flushplay(); curnot=5; loaded=true; break; case 'g': flushplay(); curnot=7; loaded=true; break; case 'a': flushplay(); curnot=9; loaded=true; break; - case 'b': flushplay(); curnot=11; loaded=true; break; + case 'h': flushplay(); curnot=11; loaded=true; break; case 'p': flushplay(); curnot=-1000; loaded=true; break; case '#': curnot++; break; + case 'b': curnot--; break; case '1': flushplay(); curlen=128; break; case '2': flushplay(); curlen=64; break; case '4': flushplay(); curlen=32; break; case '5': flushplay(); curlen=48; break; case '8': flushplay(); curlen=16; break; case '6': flushplay(); curlen=8; break; - case 'u': flushplay(); curoct=-2; break; - case 'l': flushplay(); curoct=-1; break; - case 'h': flushplay(); curoct=0; break; - case 'x': flushplay(); curoct=1; break; + case '_': flushplay(); curoct=-2; break; + case '.': flushplay(); curoct=-1; break; + case '-': flushplay(); curoct=0; break; + case '^': flushplay(); curoct=1; break; default:break; }; pos++; -- 1.6.2.2