zynaddsubfx

commit 99420bfa7fc96b2d3217e91311680204ef41b4d3
parent 1a39c6d3bc182d21e29200dc28a0afb0ba26085e
Author: paulnasca <paulnasca>
Date:   Sun, 22 Aug 2004 21:10:41 +0000

*** empty log message ***

Diffstat:
M
src/Makefile
 | 
2
+-
M
src/Params/PresetsStore.C
 | 
17
+++++++++++++----
M
src/UI/ConfigUI.fl
 | 
7
+++----

3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -1,7 +1,7 @@
 include Makefile.inc
 
 ifneq ($(MAKECMDGOALS),debug)
-  CXXFLAGS= -O6 -Wall 
+  CXXFLAGS= -O6 -ggdb -Wall 
 else 
   CXXFLAGS= -O0 -ggdb -Wall -Wpointer-arith -Wstrict-prototypes
 endif
diff --git a/src/Params/PresetsStore.C b/src/Params/PresetsStore.C
@@ -89,18 +89,22 @@ void PresetsStore::rescanforpresets(char *type){
     for (int i=0;i<MAX_BANK_ROOT_DIRS;i++){
 	if (config.cfg.presetsDirList[i]==NULL) continue;
 	char *dirname=config.cfg.presetsDirList[i];
-	//de continuat aici
 	DIR *dir=opendir(dirname);
 	if (dir==NULL) continue;
 	struct dirent *fn;
 	while((fn=readdir(dir))){
 	    const char *filename=fn->d_name;
 	    if (strstr(filename,ftype)==NULL) continue;
+	    
+	    
 	    presets[presetk].file=new char [MAX_STRING_SIZE];
 	    presets[presetk].name=new char [MAX_STRING_SIZE];
-	    snprintf(presets[presetk].file,MAX_STRING_SIZE,"%s%s",dirname,filename);
+	    char tmpc=dirname[strlen(dirname)-1];
+	    char *tmps="/";
+	    if ((tmpc=='/')||(tmpc=='\\')) tmps="";
+	    snprintf(presets[presetk].file,MAX_STRING_SIZE,"%s%s%s",dirname,tmps,filename);
 	    snprintf(presets[presetk].name,MAX_STRING_SIZE,"%s",filename);
-	    
+
 	    char *tmp=strstr(presets[presetk].name,ftype);
 	    if (tmp!=NULL) tmp[0]='\0';
 	    presetk++; if (presetk>=MAX_PRESETS) return;
@@ -127,7 +131,12 @@ void PresetsStore::copypreset(XMLwrapper *xml,char *type, const char *name){
 	tmpfilename[i]='_';
     };
     
-    snprintf(filename,MAX_STRING_SIZE,"%s%s.%s.xpz",config.cfg.presetsDirList[0],name,type);
+    char *dirname=config.cfg.presetsDirList[0];
+    char tmpc=dirname[strlen(dirname)-1];
+    char *tmps="/";
+    if ((tmpc=='/')||(tmpc=='\\')) tmps="";
+
+    snprintf(filename,MAX_STRING_SIZE,"%s%s%s.%s.xpz",dirname,tmps,name,type);
     
     xml->saveXMLfile(filename);
 };
diff --git a/src/UI/ConfigUI.fl b/src/UI/ConfigUI.fl
@@ -42,7 +42,7 @@ o->hide();}
         xywh {5 5 500 305}
       } {
         Fl_Group {} {
-          label {Main settings}
+          label {Main settings} selected
           xywh {5 25 500 285}
         } {
           Fl_Group {} {
@@ -307,7 +307,7 @@ presetbrowse->add(dirname);}
           Fl_Button removepresetbutton {
             label {Remove preset dir...}
             callback {if (presetbrowse->value()!=0) {
-   presetbrowse->remove(rootsbrowse->value());
+   presetbrowse->remove(presetbrowse->value());
 };
 activatebutton_presetdir(false);}
             xywh {105 265 80 35} box THIN_UP_BOX align 128
@@ -373,8 +373,7 @@ for (int i=0;i<MAX_BANK_ROOT_DIRS;i++){
 for (int n=0;n<rootsbrowse->size();n++){ 
      config.cfg.bankRootDirList[n]=new char [MAX_STRING_SIZE];
      strncpy(config.cfg.bankRootDirList[n],rootsbrowse->text(n+1),MAX_STRING_SIZE);
-};} {selected
-    }
+};} {}
   }
   Function {readpresetcfg()} {} {
     code {presetbrowse->clear();