author | mickeyl <mickeyl> | 2004-01-20 15:51:03 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-01-20 15:51:03 (UTC) |
commit | 996826e77a8f96ada424814716178e65caba9287 (patch) (side-by-side diff) | |
tree | 09c60dcc4437dba1838c086b7eeb5480800716d5 /noncore | |
parent | 557eb6a25f2cfc6e350c1731ead4df0e07861f25 (diff) | |
download | opie-996826e77a8f96ada424814716178e65caba9287.zip opie-996826e77a8f96ada424814716178e65caba9287.tar.gz opie-996826e77a8f96ada424814716178e65caba9287.tar.bz2 |
package the guitar sample
fix reading from share/powerchord/
-rw-r--r-- | noncore/multimedia/powerchord/gs.cpp | 17 | ||||
-rw-r--r-- | noncore/multimedia/powerchord/gs.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/powerchord/opie-powerchord.control | 8 |
3 files changed, 15 insertions, 11 deletions
diff --git a/noncore/multimedia/powerchord/gs.cpp b/noncore/multimedia/powerchord/gs.cpp index a3e85c9..fdcfb74 100644 --- a/noncore/multimedia/powerchord/gs.cpp +++ b/noncore/multimedia/powerchord/gs.cpp @@ -15,12 +15,13 @@ #include <string.h> #include <stdlib.h> //#include <qpainter.h> #include <qmessagebox.h> +#include <qstring.h> gs::gs() { finger[0] = OPEN; @@ -63,40 +64,44 @@ gs::gs() for (reverb_ptr=0;reverb_ptr<1024;reverb_ptr++){ reverb[reverb_ptr] = 0; } reverb_ptr = 0; reverb_max = 1024; - // load sampled 'E' string + // load sampled 'E' string int samplen = 25000; signed short *dsp_buf = (signed short *)malloc(samplen * sizeof(signed short)); signed short *dsp_buf_ptr = dsp_buf; int raw_fd; - raw_fd = open(ACGUITAR_PATH_S, O_RDONLY); - + + QString path = getenv( "OPIEDIR" ); + path.append( "/share/powerchord/acguitar.raw" ); + + raw_fd = open( (const char*) path, O_RDONLY); + if (raw_fd < 0){ fprintf(stderr, "Failed to open raw file (%s)\n", strerror(errno)); exit(-1); } int totread = 0; int i; - + while (totread < samplen*2){ int want = samplen*2 - totread; int numread = read(raw_fd, dsp_buf_ptr, want); fprintf(stderr, "read %d bytes\n", numread); totread += numread; dsp_buf_ptr += numread/2; - + if (numread == 0){ fprintf(stderr, "failed to read bytes\n"); - exit(-1); + exit(-1); } } close(raw_fd); // scale down a bit for mixing diff --git a/noncore/multimedia/powerchord/gs.h b/noncore/multimedia/powerchord/gs.h index 3e4c04d..f2b309f 100644 --- a/noncore/multimedia/powerchord/gs.h +++ b/noncore/multimedia/powerchord/gs.h @@ -5,13 +5,12 @@ #include <qobject.h> // sound includes #include <sys/soundcard.h> #define BUFSIZE 256 #define NUMCHANS 7 -#define ACGUITAR_PATH_S "/usr/local/projects/opie-head/noncore/multimedia/powerchord/acguitar.raw" class gs : public QObject { Q_OBJECT public: diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control index 7f45999..d295031 100644 --- a/noncore/multimedia/powerchord/opie-powerchord.control +++ b/noncore/multimedia/powerchord/opie-powerchord.control @@ -1,10 +1,10 @@ -Files: bin/powerchord apps/Applications/powerchord.desktop pics/powerchord sounds/powerchord +Files: bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord Priority: optional -Section: qpe/applications +Section: Applications Maintainer: Camilo Mesias <camilo@mesias.co.uk> Architecture: arm -Version: 0.0.7 -Depends: qpe-base ($QPE_VERSION) +Version: 0.0.8 +Depends: task-opie-minimal Description: Guitar Chord generator application Allows naming of chords using base note and key. Fretboard diagrams are produced illustrating ways to play the chord. |