commit ac97f2615fec1d20a49e9b88e6248f542dff77ce
parent cee6580c7e645bdb2e61fcacff5c226021297168
Author: paulnasca <paulnasca>
Date: Sun, 22 Aug 2004 11:53:56 +0000
*** empty log message ***
Diffstat:
7 files changed, 62 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -698,6 +698,6 @@
- Adaugata partea de salvare/incarcare a listei directoarelor unde se afla presetarile
21 Aug 2004 - Am lucrat putin la salvare/incarcare a listei dir. cu presetari
22 Aug 2004 - Corectata o eroare de compilare
-
+ - Makefile-ul modificat, a.i. make-ul sa se opreasca in caz de eroare
\ No newline at end of file
diff --git a/src/Makefile b/src/Makefile
@@ -47,28 +47,33 @@ LIBS+= `pkg-config --libs jack`
endif
objects=main.o
-subdirs=DSP Effects Input Misc Output Params Synth Seq
+SUBDIRS=DSP Effects Input Misc Output Params Synth Seq
+
+.PHONY: subdirs $(SUBDIRS)
all:
yes " " | head
$(MAKE) -C UI $@
- rm -f Make.deps
- @for name in $(subdirs); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done
- @for name in $(subdirs); do sh -c "make -C $$name $@"; done
+ @sh -c "cd UI ; $(CXX) -MM -MG -w *.cc >> ../Make.deps ; cd .."
+ @for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done
+ $(MAKE) subdirs
$(MAKE) objs
rm -f zynaddsubfx zynaddsubfx.exe
+ rm -f Make.deps
ifneq ($(AUDIOOUT),VST)
$(CXX) -o zynaddsubfx */*.o *.o $(LIBS)
else
gcc -shared -o zynaddsubfx_vst.dll */*.o *.o $(LIBS) zynaddsubfx_gcc.def
-# gcc -mdll -o temp1.tmp -Wl,--base-file,temp2.tmp */*.o *.o $(LIBS)
-# dlltool --dllname zynaddsubfx_vst.dll --def zynaddsubfx_gcc.def --base-file temp2.tmp --output-exp temp3.tmp
-# gcc -mdll -o zynaddsubfx_vst.dll */*.o *.o $(LIBS) -Wl,temp3.tmp
-# rm temp1.tmp temp2.tmp temp3.tmp
endif
+subdirs: $(SUBDIRS)
+
+$(SUBDIRS):
+ $(MAKE) -C $@
+
+
objs:$(objects)
debug: all
@@ -81,7 +86,7 @@ main.o:Misc/Master.h Misc/Util.h Output/OSSaudiooutput.h\
.PHONY : clean
clean:
rm -f $(objects) makeinclude.deps zynaddsubfx zynaddsubfx_vst.dll zynaddsubfx.exe
- @for name in $(subdirs); do sh -c "make -C $$name $@"; done
+ @for name in $(SUBDIRS); do sh -c "make -C $$name $@"; done
rm -f Make.deps
rm -f */*.o *.o
$(MAKE) -C UI $@
diff --git a/src/Params/Presets.C b/src/Params/Presets.C
@@ -105,3 +105,9 @@ void Presets::setelement(int n){
nelement=n;
};
+void Presets::rescanforpresets(){
+ presetsstore.rescanforpresets(type);
+};
+
+
+
diff --git a/src/Params/Presets.h b/src/Params/Presets.h
@@ -38,6 +38,9 @@ class Presets{
char type[MAX_PRESETTYPE_SIZE];
void setelement(int n);
+
+ void rescanforpresets();
+
protected:
void setpresettype(char *type);
private:
diff --git a/src/Params/PresetsStore.h b/src/Params/PresetsStore.h
@@ -44,6 +44,8 @@ class PresetsStore{
char *name;
};
presetstruct presets[MAX_PRESETS];
+
+ void rescanforpresets(char *type);
private:
struct {
@@ -52,7 +54,6 @@ class PresetsStore{
} clipboard;
void clearpresets();
- void rescanforpresets(char *type);
};
diff --git a/src/UI/MicrotonalUI.fl b/src/UI/MicrotonalUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0103
+version 1.0105
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
@@ -28,7 +28,7 @@ class MicrotonalUI {} {
Function {make_window()} {} {
Fl_Window microtonaluiwindow {
label Scales
- xywh {487 190 405 450} hide
+ xywh {140 189 405 450} type Double hide
} {
Fl_Group {} {
tooltip {Center where the note's freqs. are turned upside-down} xywh {249 2 155 45} box ENGRAVED_FRAME
@@ -101,10 +101,10 @@ if (filename==NULL) return;
int result=microtonal->loadscl(filename);
if (result==0) {
updateTuningsInput();
- nameinput->cut(0,tuningsinput->maximum_size());
+ nameinput->cut(0,nameinput->maximum_size());
nameinput->insert((char *)microtonal->Pname);
nameinput->position(0);
- commentinput->cut(0,tuningsinput->maximum_size());
+ commentinput->cut(0,commentinput->maximum_size());
commentinput->insert((char *)microtonal->Pname);
commentinput->position(0);
tuningsinput->position(0);
@@ -222,7 +222,8 @@ if (microtonal->Penabled==0) microtonalgroup->deactivate();
}
}
}
- Function {updateTuningsInput()} {} {
+ Function {updateTuningsInput()} {selected
+ } {
code {char *tmpbuf=new char[100];
tuningsinput->cut(0,tuningsinput->maximum_size());
diff --git a/src/UI/PresetsUI.fl b/src/UI/PresetsUI.fl
@@ -5,6 +5,9 @@ code_name {.cc}
decl {\#include <FL/fl_ask.h>} {public
}
+decl {\#include <stdio.h>} {public
+}
+
decl {\#include <stdlib.h>} {public
}
@@ -32,19 +35,21 @@ pastewin->hide();delete(pastewin);} {}
} {
Fl_Window copywin {
label {Copy to Clipboard/Preset}
- xywh {237 99 265 315} type Double box PLASTIC_THIN_UP_BOX color 238 non_modal visible
+ xywh {243 174 265 315} type Double box PLASTIC_THIN_UP_BOX color 238 non_modal visible
} {
- Fl_Browser {} {
- xywh {10 30 245 200}
+ Fl_Browser copybrowse {
+ xywh {10 25 245 205}
}
Fl_Button {} {
label {Copy to Preset}
- callback {const char *tmp=fl_input("Copy to Preset:",NULL);
+ callback {const char *tmp=presetname->value();
if (tmp!=NULL) {
- p->copy(tmp);
- copywin->hide();
-};} selected
- xywh {75 240 120 20} box THIN_UP_BOX
+ if (strlen(tmp)>0){
+ p->copy(tmp);
+ copywin->hide();
+ };
+};}
+ xywh {145 235 110 20} box THIN_UP_BOX
}
Fl_Button {} {
label {Copy to Clipboard}
@@ -59,17 +64,20 @@ copywin->hide();}
}
Fl_Box {} {
label {Type:}
- xywh {10 5 45 20} align 20
+ xywh {10 5 40 15} labelsize 12 align 20
}
Fl_Box copytypetext {
- xywh {50 5 200 20} box FLAT_BOX color 239 labelfont 1 align 20
+ xywh {50 5 205 15} box FLAT_BOX color 238 labelfont 1 labelsize 12 align 20
+ }
+ Fl_Input presetname {
+ xywh {10 235 130 20}
}
}
Fl_Window pastewin {
label {Paste from Clipboard/Preset}
xywh {516 204 265 315} type Double box PLASTIC_THIN_UP_BOX color 238 hide modal
} {
- Fl_Browser {} {
+ Fl_Browser pastebrowse {
xywh {10 30 245 205} type Hold
}
Fl_Button {} {
@@ -88,12 +96,12 @@ pui->refresh();}
callback {pastewin->hide();}
xywh {160 270 80 35} box THIN_UP_BOX align 192
}
+ Fl_Box pastetypetext {
+ xywh {55 5 200 15} box FLAT_BOX color 238 labelfont 1 labelsize 12 align 20
+ }
Fl_Box {} {
label {Type:}
- xywh {10 5 45 20} align 20
- }
- Fl_Box pastetypetext {
- xywh {50 5 200 20} box FLAT_BOX color 239 labelfont 1 align 20
+ xywh {15 5 40 15} labelsize 12 align 20
}
}
}
@@ -102,6 +110,7 @@ pui->refresh();}
code {this->p=p;
this->pui=NULL;
bool but=(Fl::event_button()!=FL_LEFT_MOUSE);
+presetname->cut(0,presetname->maximum_size());
if (but) p->copy(NULL);
else {
@@ -133,6 +142,12 @@ copy(p);} {}
code {p->setelement(n);
paste(p,pui);} {}
}
+ Function {rescan()} {open
+ } {
+ code {copybrowse->clear();
+pastebrowse->clear();} {selected
+ }
+ }
decl {Presets *p;} {public
}
decl {PresetsUI_ *pui;} {public
