commit fbae8a0496a88b07a3c746cdbb74c5293be10161
parent eae1788e91c24920743fe891b00fc952f016c64e
Author: paulnasca <paulnasca>
Date: Tue, 20 Jul 2004 17:19:14 +0000
*** empty log message ***
Diffstat:
6 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -656,4 +656,5 @@
19 Iul 2004 - Corectata doua mici erori (se incarca gresit parametrii filtrului de la OscilGen)
- Corectata inca o mica eroare care facea ca sa nu se coloreze butonul PAD_Synth Apply in rosu la anumiti parametrii de la oscilgen
- Se dezactiveaza butoanele Edit de la PartUI ca sa nu se poata edita module de sinteza inactive
+20 Iul 2004 - Corectate cateva erori cu compilare pe windows
diff --git a/banks/Pads/0065-Dream of the Saw.xiz b/banks/Pads/0065-Dream of the Saw.xiz
Binary files differ.
diff --git a/src/Misc/Bank.C b/src/Misc/Bank.C
@@ -221,7 +221,9 @@ int Bank::loadbank(const char *bankdirname){
struct dirent *fn;
while ((fn=readdir(dir))){
+#ifndef OS_WINDOWS
if (fn->d_type!=DT_REG) continue;//this is not a regular file
+#endif
const char *filename= fn->d_name;
//sa verific daca e si extensia dorita
@@ -282,7 +284,11 @@ int Bank::newbank(const char *newbankdirname){
strncat(bankdir,"/",MAX_STRING_SIZE);
};
strncat(bankdir,newbankdirname,MAX_STRING_SIZE);
+#ifdef OS_WINDOWS
+ result=mkdir(bankdir);
+#else
result=mkdir(bankdir,S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+#endif
if (result<0) return(-1);
snprintf(tmpfilename,MAX_STRING_SIZE,"%s/%s",bankdir,FORCE_BANK_DIR_FILE);
@@ -355,13 +361,13 @@ void Bank::rescanforbanks(){
char *currentrootdir=new char [dirlistlen];
while (start<dirlistlen){
for (int i=start+1;i<dirlistlen;i++){
- if (dirlist[i]<32) break;
end=i;
+ if (dirlist[i]<32) break;
};
snprintf(currentrootdir,end-start+2,"%s",&dirlist[start]);
//a root director was found
- scanrootdir(currentrootdir);
+ if (strlen (currentrootdir)>1) scanrootdir(currentrootdir);
start=end+2;
};
@@ -397,7 +403,9 @@ void Bank::scanrootdir(char *rootdir){
struct dirent *fn;
while ((fn=readdir(dir))){
+#ifndef OS_WINDOWS
if (fn->d_type!=DT_DIR) continue;//this is not a directory
+#endif
const char *dirname=fn->d_name;
if (dirname[0]=='.') continue;
@@ -412,7 +420,9 @@ void Bank::scanrootdir(char *rootdir){
struct dirent *fname;
while((fname=readdir(d))){
+#ifndef OS_WINDOWS
if (fname->d_type!=DT_REG) continue;//this is not a regular file
+#endif
if ((strstr(fname->d_name,INSTRUMENT_EXTENSION)!=NULL)||
(strstr(fname->d_name,FORCE_BANK_DIR_FILE)!=NULL)){
isbank=true;
diff --git a/src/Misc/Master.C b/src/Misc/Master.C
@@ -27,6 +27,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include <unistd.h>
+
Master::Master(){
swaplr=0;
@@ -723,8 +725,12 @@ void Master::exportbankasxmldirectory(const char *bankfilename){
directory[i]='_';
};
-
+
+#ifdef OS_WINDOWS
+ mkdir(directory);
+#else
mkdir(directory,S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+#endif
for (int slot=0;slot<128;slot++){
tmppart->defaults();
oldbank.loadfilebank(bankfilename);
diff --git a/src/Seq/Sequencer.C b/src/Seq/Sequencer.C
@@ -137,10 +137,9 @@ void Sequencer::resettime(timestruct *t){
timeval tval;
t->last=0.0;
- #ifndef windows
+ #ifndef OS_WINDOWS
if (gettimeofday(&tval,NULL)==0)
t->last=tval.tv_sec+tval.tv_usec*0.000001;
- else t->last=0.0;
#endif
};
@@ -152,7 +151,6 @@ void Sequencer::updatecounter(timestruct *t){
if (gettimeofday(&tval,NULL)==0)
current=tval.tv_sec+tval.tv_usec*0.000001;
#endif
- else current=0.0;
t->rel=current - t->last;
t->abs+=t->rel;
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -76,23 +76,21 @@ refresh();} {}
if (*nselected==nslot) color(6);
-label(bank->getnamenumbered(nslot));} {selected
- }
+label(bank->getnamenumbered(nslot));} {}
}
decl {int *what,*whatslot,nslot,highlight, *nselected;} {}
decl {void (BankProcess_:: *fnc)(void);} {}
decl {BankProcess_ *bp;} {}
}
-class BankUI {: {public BankProcess_}
+class BankUI {open : {public BankProcess_}
} {
- Function {make_window()} {open
- } {
+ Function {make_window()} {} {
Fl_Window bankuiwindow {
label Bank
- xywh {4 64 785 575} type Double
+ xywh {4 64 785 575} type Double hide
code0 {o->label(bank->bankfiletitle);}
- code1 {if (bank->bankfiletitle==NULL) o->label ("Choose a bank to use by pressing the 'Load/Use Bank from file...' button or choose 'New Bank...' to make a new bank.");} visible
+ code1 {if (bank->bankfiletitle==NULL) o->label ("Choose a bank to use by pressing the 'Load/Use Bank from file...' button or choose 'New Bank...' to make a new bank.");}
} {
Fl_Button {} {
label Close
@@ -323,7 +321,8 @@ for (int i=0;i<BANK_SIZE;i++) bs[i]->refresh();} {}
bs[ns]->refresh();
};} {}
}
- Function {rescan_for_banks()} {} {
+ Function {rescan_for_banks()} {selected
+ } {
code {banklist->clear();
banklist->add(" ");
bank->rescanforbanks();
