set the AudioDriver to 44.1KHz the Select and Start in InputManager a…

…re mirrored to Square and Triangle for Vita add the sceIOmkdir to the right directory

picoloop/AudioDriverPSVita.cpp

@@ -15,7 +15,7 @@ AudioDriver::AudioDriver()
   sdlAudioSpecWanted->channels = 2;    /* 1 = mono, 2 = stereo */
   sdlAudioSpecWanted->samples = BUFFER_FRAME;  /* Good low-latency value for callback */
   sce_size = 2048;
-  sce_freq = 8;
+  sce_freq = 7;
   //sce_mode = SCE_AUDIO_OUT_MODE_MONO;
   sce_mode = SCE_AUDIO_OUT_MODE_STEREO;
   sce_vol  = SCE_AUDIO_VOLUME_0DB;

picoloop/InputManager.cpp

@@ -234,6 +234,7 @@ int InputManager::handleKey()
   if (!(pad.buttons & keypadtotest) && m_key_state[keypadtotest]==1)
     { m_key_state[keypadtotest]=0; keypressrelease=1; keydown=0; key=1; keypadtotest_valid=keypadtotest; }
 
+
   keypadtotest=SCE_CTRL_START;
   if ((pad.buttons & keypadtotest) && (m_key_state[keypadtotest]==0))
     { m_key_state[keypadtotest]=1; keypressrelease=1; keydown=1; key=1; keypadtotest_valid=keypadtotest;  }
@@ -249,6 +250,11 @@ int InputManager::handleKey()
   if (keypressrelease)
     {
       this->updateState(keypadtotest_valid,keydown);
+      if (keypadtotest_valid == SCE_CTRL_TRIANGLE)
+	this->updateState(SCE_CTRL_START,keydown);
+      if (keypadtotest_valid == SCE_CTRL_SQUARE)
+	this->updateState(SCE_CTRL_SELECT,keydown);
+
       last_key=keypadtotest_valid;
       if (keydown) last_event=KEYPRESSED;
       else         last_event=KEYRELEASED;

picoloop/Makefile.PatternPlayer_psvita_SDL2

@@ -14,6 +14,8 @@ CFLAGS   += -I.
 #CXXFLAGS +=                -D__SDL20__ -DPSVITA -D__SDL_AUDIO__ -fpermissive -std=c++11 -I. -I$(VITASDK)/arm-vita-eabi/include/ -L$(VITASDK)/arm-vita-eabi/lib -lSDL2 
 #CXXFLAGS += -DDEBUG_PRINTF -D__SDL20__ -DPSVITA -D__SDL_AUDIO__ -fpermissive -std=c++11 -I. -I$(VITASDK)/arm-vita-eabi/include/ -L$(VITASDK)/arm-vita-eabi/lib -lSDL2
 #CXXFLAGS += -DDEBUG_PRINTF -D__SDL20__ -DPSVITA -D__PSVITA_AUDIO__ -fpermissive -std=c++11 -I. -I$(VITASDK)/arm-vita-eabi/include/ -L$(VITASDK)/arm-vita-eabi/lib -lSDL2 -Wpointer-arith
+#CXXFLAGS += -O2 -D__SDL20__ -DPSVITA -D__PSVITA_AUDIO__ -fpermissive -std=c++11 -I. -I$(VITASDK)/arm-vita-eabi/include/ -L$(VITASDK)/arm-vita-eabi/lib -lSDL2 -Wpointer-arith
+#CXXFLAGS += -O2 -DDEBUG_PRINTF -D__SDL20__ -DPSVITA -D__PSVITA_AUDIO__ -fpermissive -std=c++11 -I. -I$(VITASDK)/arm-vita-eabi/include/ -L$(VITASDK)/arm-vita-eabi/lib -lSDL2 -Wpointer-arith
 CXXFLAGS += -O2 -D__SDL20__ -DPSVITA -D__PSVITA_AUDIO__ -fpermissive -std=c++11 -I. -I$(VITASDK)/arm-vita-eabi/include/ -L$(VITASDK)/arm-vita-eabi/lib -lSDL2 -Wpointer-arith
 
 #SRC_C :=$(call rwildcard, src/, *.c)

picoloop/Master.h

@@ -331,7 +331,6 @@ enum {
 
 
 #ifdef LINUX_RASPI1
-
 //#define __FPU__         0
 
 #define SCREEN_WIDTH	320

picoloop/PatternPlayer.cpp

@@ -3943,7 +3943,7 @@ int main(int argc,char **argv)
   int cpu_speed;
   int running=1;
 
-#if defined(PSVITA) && defined(DEBUGPRINTF)
+#if defined(PSVITA) && defined(DEBUG_PRINTF)
   psp2shell_init(3333,0);
   SDL_Delay(5000);
   psp2shell_print("Start\n");

picoloop/PatternReader.cpp

@@ -65,7 +65,8 @@ int PatternReader::saveSong(SongSequencer & SS)
   unsigned char line[MAX_SONG_LENGHT_BY_PROJECT];
   int i;
   int j;
-  sprintf(filename,"bank/bank%d/song.pic",bank);
+  //sprintf(filename,"bank/bank%d/song.pic",bank);
+  sprintf(filename,"%s/bank/bank%d/song.pic",GETPICOLOOPUSERSTORAGE(),bank);
   fd=fopen(filename,"w");
   if (fd==0)
     {
@@ -88,7 +89,7 @@ int PatternReader::loadSong(SongSequencer & SS)
   unsigned char line[MAX_SONG_LENGHT_BY_PROJECT]={0};
   int i;
   int j;
-  sprintf(filename,"bank/bank%d/song.pic",bank);
+  sprintf(filename,"%s/bank/bank%d/song.pic",GETPICOLOOPUSERSTORAGE(),bank);
   fd=fopen(filename,"r");
   if (fd==0)
     {
@@ -114,7 +115,8 @@ int PatternReader::loadSong(SongSequencer & SS)
 bool PatternReader::PatternRemove(int PatternNumber,int TrackNumber)
 {
   char filename[1024];
-  sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
+  //sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
+  sprintf(filename,"%s/bank/bank%d/dataP%dT%d.pic",GETPICOLOOPUSERSTORAGE(),bank,PatternNumber,TrackNumber);
   if (unlink(filename)==0)
     {
       loadedData[PatternNumber][TrackNumber]=DATA_DOES_NOT_EXIST_ON_STORAGE;
@@ -146,7 +148,8 @@ bool PatternReader::PatternDataExist(int PatternNumber,int TrackNumber)
 
   //line=(char*)malloc(1024);
   //fd=fopen(fn.c_str(),"r+");
-  sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
+  //sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
+  sprintf(filename,"%s/bank/bank%d/dataP%dT%d.pic",GETPICOLOOPUSERSTORAGE(),bank,PatternNumber,TrackNumber);
   fd=fopen(filename,"r+");
   if (fd==0)
     {
@@ -296,7 +299,8 @@ bool PatternReader::readPatternData(int PatternNumber,int TrackNumber, Pattern &
       return true;
     }
 
-  sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
+  //sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
+  sprintf(filename,"%s/bank/bank%d/dataP%dT%d.pic",GETPICOLOOPUSERSTORAGE(),bank,PatternNumber,TrackNumber);
 
 
   //check if file name can be open
@@ -709,21 +713,21 @@ bool PatternReader::writePattern(int PatternNumber, int TrackNumber, Pattern & P
   mode_t mode;
 
   int sizeoflinemax=1024;
-  //mode=0666;
-  //mode=S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IWGRP|S_IROTH|S_IWOTH;
 
-  //mode=0755;
+  // Create the path to the storage if it does not exist
+  // Should be good^Wbetter if I check if it exist before launching bunch of syscall
+  // Without any check...
+  sprintf(path,    GETPICOLOOPUSERSTORAGE());
+  MKDIR(path);
 
-  sprintf(path,    "bank");
-  //mkdir(path,mode);
+  sprintf(path,    "%s/%s",GETPICOLOOPUSERSTORAGE(),"bank");
   MKDIR(path);
 
-  sprintf(path,    "bank/bank%d",bank);
-  //mkdir(path,mode);
+  sprintf(path,    "%s/bank/bank%d",GETPICOLOOPUSERSTORAGE(),bank);
   MKDIR(path);
 
-  sprintf(filename,"bank/bank%d/dataP%dT%d.pic",bank,PatternNumber,TrackNumber);
-
+  sprintf(filename,"%s/bank/bank%d/dataP%dT%d.pic",GETPICOLOOPUSERSTORAGE(),bank,PatternNumber,TrackNumber);
+  //return 0;
   //  printf("SIZE:%d\n",P.getSize());
   //  exit(1);
 

picoloop/SYSTEM.h

@@ -1 +1,4 @@
-int MKDIR(const char *pathname);
+int    MKDIR(const char *pathname);
+char * GETHOME();
+char * GETPICOLOOPUSERSTORAGE();
+char * GETPICOLOOPSYSTEMSTORAGE();

picoloop/SYSTEMLINUX.cpp

@@ -2,11 +2,39 @@
 #define __SYSTEM__
 
 #include "SYSTEM.h"
-
-
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#define MAXHOMEPATH 256
+
+
+char * GETPICOLOOPSYSTEMSTORAGE()
+{
+  //static char * systemstorage="/usr/share/picoloop/";
+  static char * systemstorage="./";
+  return systemstorage;
+}
+
+char * GETPICOLOOPUSERSTORAGE()
+{
+  static char picoloophome[MAXHOMEPATH];
+  //snprintf(picoloophome,"%s/.picoloop/",GETHOME());
+  sprintf(picoloophome,"./");
+  return picoloophome;
+}
+
+char * GETHOME()
+{
+  static char homedir[MAXHOMEPATH];
+  sprintf(homedir, MAXHOMEPATH, "%s", getenv("HOME"));
+  return homedir;
+}
+
 int MKDIR(const char *pathname)
 {
   mode_t mode;

picoloop/SYSTEMPSVITA.cpp

@@ -2,18 +2,41 @@
 #define __SYSTEM__
 
 #include "SYSTEM.h"
-
+#include "Master.h"
+#define MAXHOMEPATH 256
 
 //#include <sys/stat.h>
 //#include <sys/types.h>
 #include <psp2/io/stat.h>
+#include <stdio.h>
+
+char * GETHOME()
+{
+  static char homedir[MAXHOMEPATH];
+  sprintf(homedir,"ux0:/app/PICOLOOP1");
+  return homedir;
+}
+
+char * GETPICOLOOPUSERSTORAGE()
+{
+  static char homedir[MAXHOMEPATH];
+  sprintf(homedir,"ux0:/data/PICOLOOP1");
+  return homedir;
+}
+char * GETPICOLOOPSYSTEMSTORAGE()
+{
+  static char homedir[MAXHOMEPATH];
+  sprintf(homedir,"ux0:/app/PICOLOOP1");
+  return homedir;
+}
 
 int MKDIR(const char *pathname)
 {
   SceMode mode;
   //mode_t mode;
-  mode=0755; 
+  mode=0777; 
   //mkdir(pathname,mode);
+  DPRINTF("Creating directory %s",pathname);
  sceIoMkdir(pathname,mode);
 }