commit 2cc968c0fa38ef79528740269109e18c45aa002b
parent dc367a4b920a7a34e667301e9e16e38b3be30f59
Author: fundamental <[email protected]>
Date: Tue, 4 May 2010 09:19:37 -0400
Merge branch 'master' into nio
Conflicts:
src/CMakeLists.txt
Diffstat:
8 files changed, 68 insertions(+), 144 deletions(-)
diff --git a/doc/saving.txt b/doc/saving.txt
@@ -0,0 +1,55 @@
+Persistence
+===========
+
+As with most applications ZynAddSubFX allows for one to ave your work and reload
+it.
+
+Saving it all
+-------------
+
+One of the simplest ways to save your work is to save the entire session.
+This can be done through the File menu and will result in the creation of an
+.xmz file.
+Once created, this file will hold the settings for all settings within that
+session, such as microtonal tunings, all patches, system effects, insertion
+effects, etc...
+
+Saving Parts
+------------
+
+In many cases saving everything is not what is desired.
+Saving a patch later on is one such example.
+
+Patches
+~~~~~~~
+In order to save a patch, one can either save it from the instruments menu or
+through the bank window.
+
+With the instrument menu, one can just save the file to any given location with
+the .xiz extension.
+
+With the banks menu, one can assign a patch to a given slot with a bank.
+This instrument will remain here for future use until it is deleted.
+To see the physical location of the .xiz file, one should check the
+File->Settings->Bank_Root_Dirs window to see the paths for banks.
+
+NOTE: You need to have write permissions to add instruments to the bank.
+
+Presets
+~~~~~~~
+Have a favorite setting for an envelope, a difficult to reproduce oscillator?
+Then presets are for you.
+Presets allow for one to save the settings for any of the components which
+support copy/paste operations.
+This is done with preset files (.xpz), which get stored in the folders indicated
+by File->Settings->Preset_Root_Dirs.
+
+Summary
+-------
+
+.Extension Summary
+[literal]
+xmz Everything
+xiz Instrument
+xsz Scale Settings
+xpz Presets
diff --git a/doc/zynaddsubfx.txt b/doc/zynaddsubfx.txt
@@ -17,6 +17,8 @@ include::./controller.txt[]
include::./nrpn.txt[]
+include::./saving.txt[]
+
include::./mididefaults.txt[]
include::./build.txt[]
diff --git a/src/Samples/AuSample.cpp b/src/Samples/AuSample.cpp
@@ -1,28 +0,0 @@
-/*
- ZynAddSubFX - a software synthesizer
-
- AuSample.h - Object for storing information on audio samples (for one channel)
- Copyright (C) 2009-2009 Mark McCurry
- Author: Mark McCurry
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License (version 2 or later) for more details.
-
- You should have received a copy of the GNU General Public License (version 2)
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "AuSample.h"
-
-AuSample::AuSample(int length, REALTYPE fill)
- :Sample(length, fill) {}
-
-AuSample::AuSample(int length, const REALTYPE *input)
- :Sample(length, input) {}
-
diff --git a/src/Samples/AuSample.h b/src/Samples/AuSample.h
@@ -1,35 +0,0 @@
-/*
- ZynAddSubFX - a software synthesizer
-
- AuSample.h - Object for storing information on audio samples (for one channel)
- Copyright (C) 2009-2009 Mark McCurry
- Author: Mark McCurry
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License (version 2 or later) for more details.
-
- You should have received a copy of the GNU General Public License (version 2)
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef AUSAMPLE_H
-#define AUSAMPLE_H
-
-#include "Sample.h"
-#include "FqSample.h"
-
-class AuSample:public Sample
-{
- public:
- AuSample(int length, REALTYPE fill = 0);
- AuSample(int length, const REALTYPE *input);
- FqSample getFqSample(); /**\todo implement this*/
-};
-#endif
-
diff --git a/src/Samples/FqSample.cpp b/src/Samples/FqSample.cpp
@@ -1,33 +0,0 @@
-/*
- ZynAddSubFX - a software synthesizer
-
- FqSample.C - Object for storing information on samples
- Copyright (C) 2009-2009 Mark McCurry
- Author: Mark McCurry
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License (version 2 or later) for more details.
-
- You should have received a copy of the GNU General Public License (version 2)
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "FqSample.h"
-
-FqSample::FqSample(int length, REALTYPE fill)
- :Sample(length, fill)
-{}
-
-FqSample::FqSample(int length, const REALTYPE *input)
- :Sample(length, input)
-{}
-
-FqSample::~FqSample()
-{}
-
diff --git a/src/Samples/FqSample.h b/src/Samples/FqSample.h
@@ -1,37 +0,0 @@
-/*
- ZynAddSubFX - a software synthesizer
-
- FqSample.h - Object for storing information on samples
- Copyright (C) 2009-2009 Mark McCurry
- Author: Mark McCurry
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License (version 2 or later) for more details.
-
- You should have received a copy of the GNU General Public License (version 2)
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef MONOSAMPLE_H
-#define MONOSAMPLE_H
-
-#include "FqSample.h"
-#include "Sample.h"
-
-class FqSample:public Sample
-{
- public:
- FqSample(int length, REALTYPE fill = 0);
- FqSample(int length, const REALTYPE *input);
- ~FqSample();
- //FqSample &operator=(const FqSample &smp);
- //float *dontuse(){return buffer;};
-};
-#endif
-
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0300
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -704,8 +704,7 @@ refresh(eff);}
}
}
}
- Function {make_analog_phaser_window()} {selected
- } {
+ Function {make_analog_phaser_window()} {} {
Fl_Window effaphaserwindow {
xywh {292 251 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
code0 {putchar('a'); putchar('b'); putchar('c');}
@@ -1548,7 +1547,7 @@ switch(eff->geteffect()){
break;
case 9://make_analog_phaser_window();
aphaserp->value(eff->getpreset());
- aphaser0->value(eff->geteffectpar(0));
+ aphaser0->value(eff->geteffectpar(0));if (eff->insertion!=0) aphaser0->label("D/W");
aphaser1->value(eff->geteffectpar(1));
aphaser2->value(eff->geteffectpar(2));
aphaser3->value(eff->geteffectpar(3));
@@ -1568,7 +1567,8 @@ switch(eff->geteffect()){
break;
};
-this->show();} {}
+this->show();} {selected
+ }
}
Function {refresh()} {} {
code {refresh(eff);} {}
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0300
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2009 Nasca Octavian Paul} {}
@@ -700,7 +700,7 @@ pthread_mutex_unlock(&master->mutex);}
} {
Fl_Group {} {
label {System Effects}
- xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 15 align 25 hide
+ xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 15 align 25
} {
Fl_Counter syseffnocounter {
label {Sys.Effect No.}
@@ -757,8 +757,8 @@ syseffectui->refresh(master->sysefx[nsyseff]);}
xywh {90 90 100 20} labelfont 1 labelsize 10
}
MenuItem {} {
- label APhaser
- xywh {0 0 36 21}
+ label APhaser selected
+ xywh {0 0 36 21} labelfont 1 labelsize 10
}
}
Fl_Group syseffectuigroup {
@@ -790,7 +790,7 @@ pthread_mutex_unlock(&master->mutex);}
}
Fl_Group {} {
label {Insertion Effects}
- xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 15 align 25
+ xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 15 align 25 hide
} {
Fl_Counter inseffnocounter {
label {Ins.Effect No.}
@@ -860,7 +860,7 @@ inseffectui->show();}
xywh {100 100 100 20} labelfont 1 labelsize 10
}
MenuItem {} {
- label APhaser selected
+ label APhaser
xywh {0 0 36 21} labelfont 1 labelsize 10
}
}
