commit 6b18848ee3b9f1ef028a4af7996c960865745300
parent 1937da38e89eccca3a2f40f1b628150c0df9723e
Author: paulnasca <paulnasca>
Date: Wed, 27 Apr 2005 21:14:30 +0000
*** empty log message ***
Diffstat:
5 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -789,4 +789,4 @@
--------------------------------------------------------------------------------------------------
12 Apr 2005 - Actualizat pentru MXML 2.2 (nu o sa mearga pe vers. mai vechi de mxml)
27 Apr 2005 - Adaugata posibilitatea de a inlatura complet interfata grafica in Makefile.inc (in acest caz nu mai sunt necesare bibliotecile grafice ca fltk)
-
+ - Adaugata posibilitatea de a incarca direct un instrument cu -L (deocamdata se poate incarca doar in part-ul 0)
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -1,3 +1,8 @@
+2.2.1 (28 Apr 2005)
+ - made to work with mxml-2.2 (will NOT work on older versions)
+ - it is possible to remove completely the graphical user interface (e.g. it can run without X). For this you need to modify the DISABLE_GUI option from the Makefile.inc
+ - added a commandline -L which load a instrument (.xiz) - now it only loads to part 0 (you can use this option with -l to load a master file and after this the option -L to replace the part)
+
2.2.0 (8 Apr 2005)
- the VST version of ZynAddSubFX is removed from the instalation until it will be more stable (hope soon :) )
- now, the instrument banks contains over 300 high quality instruments
diff --git a/README.txt b/README.txt
@@ -28,7 +28,6 @@ Requirements:
-------------
- a fast computer
- Linux (tested with RedHat 7.2,7.3,etc.) or Windows
- - FLTK 1.x.x (tested with fltk 1.1.0, 1.1.1, 1.1.2,etc.)
- FFTW 2.x.x (tested with fftw 2.0.5, 2.1.3) - necesary for
Fast Fourier computations
- MXML-2.2 library from http://www.easysw.com/~mike/mxml/
@@ -39,6 +38,7 @@ Requirements:
Not requred, but recomanded:
---------------------------
+ - FLTK 1.x.x (tested with fltk 1.1.0, 1.1.1, 1.1.2,etc.)
- ALSA 0.9.x or later (with OSS emulation, if you don't use JACK)
- JACKit - if you want to use it you must enable compilation for JACK in Makefile.inc
- a VST host for the VST version
diff --git a/ZynAddSubFX.lsm b/ZynAddSubFX.lsm
@@ -1,7 +1,7 @@
Begin4
Title: ZynAddSubFX
-Version: 2.2.0
-Entered-date: 08-04-2005
+Version: 2.2.1
+Entered-date: 28-04-2005
Description: A real-time software synthesizer for Linux and Windows with many
features, including polyphony, multi-timbral and microtonal
capabilities. It includes randomness of some parameters,which
diff --git a/src/main.C b/src/main.C
@@ -368,6 +368,7 @@ int main(int argc, char *argv[]){
#ifdef OS_LINUX
struct option opts[]={
{"load",2,NULL,'l'},
+ {"load-instrument",2,NULL,'L'},
{"sample-rate",2,NULL,'r'},
{"buffer-size",2,NULL,'b'},
{"oscil-size",2,NULL,'o'},
@@ -384,13 +385,14 @@ int main(int argc, char *argv[]){
int option_index=0,opt,exitwithhelp=0;
char loadfile[1001];ZERO(loadfile,1001);
+ char loadinstrument[1001];ZERO(loadinstrument,1001);
while (1){
#ifdef OS_LINUX
- opt=getopt_long(argc,argv,"l:r:b:o:hSDUAY",opts,&option_index);
+ opt=getopt_long(argc,argv,"l:L:r:b:o:hSDUAY",opts,&option_index);
char *optarguments=optarg;
#else
- opt=getopt(argc,argv,"l:r:b:o:hSDUAY",&option_index);
+ opt=getopt(argc,argv,"l:L:r:b:o:hSDUAY",&option_index);
char *optarguments=&winoptarguments[0];
#endif
@@ -421,6 +423,11 @@ int main(int argc, char *argv[]){
snprintf(loadfile,1000,"%s",optarguments);
};
break;
+ case 'L':tmp=0;
+ if (optarguments!=NULL) {
+ snprintf(loadinstrument,1000,"%s",optarguments);
+ };
+ break;
case 'r':tmp=0;
if (optarguments!=NULL) tmp=atoi(optarguments);
if (tmp>=4000) {
@@ -460,6 +467,7 @@ int main(int argc, char *argv[]){
fprintf(stderr,"%s","Usage: zynaddsubfx [OPTION]\n\n");
fprintf(stderr,"%s"," -h , --help \t\t\t\t display command-line help and exit\n");
fprintf(stderr,"%s"," -l file, --load=FILE\t\t\t loads a .xmz file\n");
+ fprintf(stderr,"%s"," -L file, --load-instrument=FILE\t\t loads a .xiz file\n");
fprintf(stderr,"%s"," -r SR, --sample-rate=SR\t\t set the sample rate SR\n");
fprintf(stderr,"%s"," -b BS, --buffer-size=SR\t\t set the buffer size (granularity)\n");
fprintf(stderr,"%s"," -o OS, --oscil-size=OS\t\t set the ADsynth oscil. size\n");
@@ -484,16 +492,33 @@ int main(int argc, char *argv[]){
if (strlen(loadfile)>1){
int tmp=master->loadXML(loadfile);
if (tmp<0) {
- fprintf(stderr,"ERROR:Could not load file %s .\n",loadfile);
+ fprintf(stderr,"ERROR:Could not load master file %s .\n",loadfile);
exit(1);
} else {
master->applyparameters();
#ifndef DISABLE_GUI
if (noui==0) ui->refresh_master_ui();
#endif
+ printf("Master file loaded.\n");
};
};
+ if (strlen(loadinstrument)>1){
+ int loadtopart=0;
+ int tmp=master->part[loadtopart]->loadXMLinstrument(loadinstrument);
+ if (tmp<0) {
+ fprintf(stderr,"ERROR:Could not load instrument file %s .\n",loadinstrument);
+ exit(1);
+ } else {
+ master->part[loadtopart]->applyparameters();
+#ifndef DISABLE_GUI
+ if (noui==0) ui->refresh_master_ui();
+#endif
+ printf("Instrument file loaded.\n");
+ };
+ };
+
+
#if !(defined(NONEMIDIIN)||defined(WINMIDIIN)||defined(VSTMIDIIN))
pthread_create(&thr1,NULL,thread1,NULL);
#endif
