Menu
▾
▴
[Alsamodular-commits] ams/src main.cpp, 1.14, 1.15 msoptions.h, 1.6, 1.7
|
From: Guido S. <gs...@us...> - 2012-02-20 20:22:36
|
Update of /cvsroot/alsamodular/ams/src
In directory vz-cvs-4.sog:/tmp/cvs-serv24376/src
Modified Files:
main.cpp msoptions.h
Log Message:
Rename commandline options "-d" (ALSA device), "-p" (Period size) and "-n" (Number of fragments)
Index: main.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/main.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** main.cpp 11 Feb 2012 22:19:54 -0000 1.14
--- main.cpp 20 Feb 2012 20:22:33 -0000 1.15
***************
*** 20,39 ****
#define AMSDIR ".alsamodular"
! static struct option options[] =
! {{"periodsize", 1, 0, 'b'},
! {"frag", 1, 0, 'f'},
! {"poly", 1, 0, 'p'},
! {"rate", 1, 0, 'r'},
! {"edge", 1, 0, 'e'},
! {"help", 0, 0, 'h'},
! {"verbose", 0, 0, 'v'},
! {"version", 0, 0, 'V'},
! {"soundcard", 1, 0, 'c'},
! #if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
! {"capture", 1, 0, 'C'},
! {"playback", 1, 0, 'P'},
! #endif
! {"presetpath", 1, 0, 'd'},
! {"nogui", 0, 0, 'n'},
{"jack", 0, 0, 'J'},
#ifdef JACK_SESSION
--- 20,24 ----
#define AMSDIR ".alsamodular"
! static struct option options[] = {
{"jack", 0, 0, 'J'},
#ifdef JACK_SESSION
***************
*** 41,46 ****
--- 26,46 ----
#endif
{"alsa", 0, 0, 'A'},
+ {"device", 1, 0, 'd'},
+ #if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
+ {"capture", 1, 0, 'C'},
+ {"playback", 1, 0, 'P'},
+ #endif
+ {"periodsize", 1, 0, 'p'},
+ {"nfrag", 1, 0, 'n'},
+ {"rate", 1, 0, 'r'},
{"in", 1, 0, 'i'},
{"out", 1, 0, 'o'},
+ {"poly", 1, 0, 'y'},
+ {"edge", 1, 0, 'e'},
+ {"presetdir", 1, 0, 'D'},
+ {"nogui", 0, 0, 'n'},
+ {"help", 0, 0, 'h'},
+ {"verbose", 0, 0, 'v'},
+ {"version", 0, 0, 'V'},
{"name", 1, 0, 'N'},
{0, 0, 0, 0}};
***************
*** 109,119 ****
{
char aboutText[] = AMS_LONGNAME " " VERSION;
- /* "\nby Matthias Nagorni and Fons Adriaensen\n"
- "(c)2002-2003 SuSE AG Nuremberg\n"
- "(c)2003 Fons Adriaensen\n"
- "Additional programming:\n"
- "2007 Malte Steiner, Karsten Wiese\n"
- "2008 Guido Scholz\n";
- */
QApplication app(argc, argv);
--- 109,112 ----
***************
*** 140,147 ****
int getopt_return;
int option_index;
ModularSynthOptions msoptions;
msoptions.synthName = "ams";
- msoptions.pcmname = DEFAULT_PCMNAME;
msoptions.cname = "";
msoptions.pname = "";
--- 133,140 ----
int getopt_return;
int option_index;
+ QString pcmname = DEFAULT_PCMNAME;
ModularSynthOptions msoptions;
msoptions.synthName = "ams";
msoptions.cname = "";
msoptions.pname = "";
***************
*** 166,170 ****
while ((getopt_return = getopt_long(argc, argv,
! "hnJjAab:p:f:e:c:d:r:i:o:vVN:"
#ifdef JACK_SESSION
"U:"
--- 159,163 ----
while ((getopt_return = getopt_long(argc, argv,
! "AaD:d:e:ghi:JjN:n:o:p:r:vVy:"
#ifdef JACK_SESSION
"U:"
***************
*** 173,196 ****
"C:P:"
#endif
! ,
! options, &option_index)) >= 0) {
switch(getopt_return) {
! case 'p':
! msoptions.poly = atoi(optarg);
! break;
! case 'b':
! msoptions.frsize = atoi(optarg);
! break;
! case 'f':
! msoptions.nfrags = atoi(optarg);
break;
! case 'e':
! msoptions.edge = atof(optarg);
break;
! case 'r':
! msoptions.fsamp = atoi(optarg);
break;
! case 'c':
! msoptions.pcmname = optarg;
break;
#if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
--- 166,188 ----
"C:P:"
#endif
! , options, &option_index)) >= 0) {
switch(getopt_return) {
! case 'J':
! case 'j':
! msoptions.forceJack = true;
! msoptions.forceAlsa = false;
break;
! #ifdef JACK_SESSION
! case 'U':
! msoptions.global_jack_session_uuid = QString(optarg);
break;
! #endif
! case 'A':
! case 'a':
! msoptions.forceJack = false;
! msoptions.forceAlsa = true;
break;
! case 'd':
! pcmname = optarg;
break;
#if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
***************
*** 202,221 ****
break;
#endif
! case 'd':
! msoptions.presetPath = optarg;
! msoptions.havePresetPath = true;
! break;
! case 'n':
! msoptions.noGui = true;
break;
! case 'J':
! case 'j':
! msoptions.forceJack = true;
! msoptions.forceAlsa = false;
break;
! case 'A':
! case 'a':
! msoptions.forceJack = false;
! msoptions.forceAlsa = true;
break;
case 'i':
--- 194,205 ----
break;
#endif
! case 'p':
! msoptions.frsize = atoi(optarg);
break;
! case 'n':
! msoptions.nfrags = atoi(optarg);
break;
! case 'r':
! msoptions.fsamp = atoi(optarg);
break;
case 'i':
***************
*** 225,233 ****
msoptions.nplay = atoi(optarg);
break;
! #ifdef JACK_SESSION
! case 'U':
! msoptions.global_jack_session_uuid = QString(optarg);
break;
- #endif
case 'v':
msoptions.verbose++;
--- 209,225 ----
msoptions.nplay = atoi(optarg);
break;
! case 'y':
! msoptions.poly = atoi(optarg);
! break;
! case 'e':
! msoptions.edge = atof(optarg);
! break;
! case 'D':
! msoptions.presetPath = optarg;
! msoptions.havePresetPath = true;
! break;
! case 'g':
! msoptions.noGui = true;
break;
case 'v':
msoptions.verbose++;
***************
*** 244,266 ****
printf("Usage:\tams [OPTION]... [PRESETFILE]\n\nOptions:\n");
printf(" -J, --jack Force JACK\n");
printf(" -A, --alsa Force ALSA\n");
! printf(" -c, --soundcard <plug> Soundcard [%s]\n", DEFAULT_PCMNAME);
#if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
printf(" -C, --capture <device> Capture device\n");
printf(" -P, --playback <device> Playback device\n");
#endif
! printf(" -b, --periodsize <frames> Periodsize [%d]\n", DEFAULT_PERIODSIZE);
! printf(" -f, --frag <num> Number of fragments [%d]\n", DEFAULT_PERIODS);
printf(" -r, --rate <samples/s> Samplerate [%d]\n", DEFAULT_RATE);
printf(" -i, --in <num> Number of ALSA/JACK input ports\n");
printf(" -o, --out <num> Number of ALSA/JACK output ports\n");
! printf(" -p, --poly <num> Polyphony [1]\n");
printf(" -e, --edge <0..10> VCO Edge [1.0]\n");
! printf(" -d, --presetdir <dir> Preset directory\n");
! printf(" -n, --nogui Start without GUI\n");
! #ifdef JACK_SESSION
! printf(" -U, --jack_session_uuid JACK session UUID\n");
! #endif
! printf(" -v verbose\n");
printf(" -V, --version Display program version information\n");
printf(" -N, --name <name> ALSA/JACK clientname, windowtitle\n\n");
--- 236,259 ----
printf("Usage:\tams [OPTION]... [PRESETFILE]\n\nOptions:\n");
printf(" -J, --jack Force JACK\n");
+ #ifdef JACK_SESSION
+ printf(" -U, --jack_session_uuid JACK session UUID\n");
+ #endif
printf(" -A, --alsa Force ALSA\n");
! printf(" -d, --device <device> ALSA device [%s]\n", DEFAULT_PCMNAME);
#if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
printf(" -C, --capture <device> Capture device\n");
printf(" -P, --playback <device> Playback device\n");
#endif
! printf(" -p, --periodsize <frames> Period size [%d]\n", DEFAULT_PERIODSIZE);
! printf(" -n, --nfrag <nfrags> Number of fragments [%d]\n", DEFAULT_PERIODS);
printf(" -r, --rate <samples/s> Samplerate [%d]\n", DEFAULT_RATE);
printf(" -i, --in <num> Number of ALSA/JACK input ports\n");
printf(" -o, --out <num> Number of ALSA/JACK output ports\n");
! printf(" -y, --poly <num> Polyphony [1]\n");
printf(" -e, --edge <0..10> VCO Edge [1.0]\n");
! printf(" -D, --presetdir <dir> Preset directory\n");
! printf(" -g, --nogui Start without GUI\n");
! printf(" -h, --help Show this message\n");
! printf(" -v, --verbose verbose warning messages\n");
printf(" -V, --version Display program version information\n");
printf(" -N, --name <name> ALSA/JACK clientname, windowtitle\n\n");
***************
*** 272,281 ****
#if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
if (msoptions.cname.isEmpty() && msoptions.pname.isEmpty()) {
! msoptions.cname = msoptions.pcmname;
! msoptions.pname = msoptions.pcmname;
}
#else
! msoptions.cname = msoptions.pcmname;
! msoptions.pname = msoptions.pcmname;
#endif
--- 265,274 ----
#if defined (HAVE_CLALSADRV_API2) || defined (HAVE_LIBZITA_ALSA_PCMI)
if (msoptions.cname.isEmpty() && msoptions.pname.isEmpty()) {
! msoptions.cname = pcmname;
! msoptions.pname = pcmname;
}
#else
! msoptions.cname = pcmname;
! msoptions.pname = pcmname;
#endif
Index: msoptions.h
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/msoptions.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** msoptions.h 11 Feb 2012 22:19:54 -0000 1.6
--- msoptions.h 20 Feb 2012 20:22:33 -0000 1.7
***************
*** 12,16 ****
struct ModularSynthOptions {
QString synthName;
- QString pcmname;
QString cname;
QString pname;
--- 12,15 ----
|