4 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
@@ -9,24 +9,25 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/soundcard.h>
 
 #include <errno.h>
 #include <string.h>
 
 #include <stdlib.h>
 
 //#include <qpainter.h>
 #include <qmessagebox.h>
+#include <qstring.h>
 
 
 gs::gs()
 {
   
   finger[0] = OPEN;
   finger[1] = OPEN;
   finger[2] = OPEN;
   finger[3] = OPEN;
   finger[4] = OPEN;
   finger[5] = OPEN;
 
@@ -57,52 +58,56 @@ gs::gs()
   pb_oct5 = 0;
   pb_oct6 = 0;
 
   // initialise reverb buffer
   reverb = (signed short *)malloc(1024 * sizeof(signed short));
 
   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
   for (i=0;i<samplen;i++){
     dsp_buf[i] /= 6;
   }
   
   set_tonebank(0, dsp_buf, samplen);
   set_tonebank(1, dsp_buf, samplen);
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
@@ -1,23 +1,22 @@
 
 #ifndef __GS_H
 #define __GS_H
 
 #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:
   gs();
   ~gs();
 
  private:
 
   int initial_fret;
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.
diff --git a/share/powerchord/acguitar.raw b/share/powerchord/acguitar.raw
new file mode 100644
index 0000000..1452147
--- a/dev/null
+++ b/share/powerchord/acguitar.raw